Skip to content

Commit

Permalink
Merge branch 'PR3971-plain-text-queue-timings' into asciitiming
Browse files Browse the repository at this point in the history
  • Loading branch information
NobodyNada committed Sep 29, 2021
2 parents 15db8db + af8731c commit 0cbc68b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion blacklisted_websites.txt
Expand Up @@ -4047,7 +4047,7 @@ bestessaywritingservicereview(?# sites.google.com)
tutorsindia\.com
legalwiser\.in
homify\.com
firebasestorage.googleapis.com/[^\s"<]*+(?=[\w\W]{0,500}\b(?:DMCA|infringed)\b)
(?:firebase)?storage.googleapis.com/[^\s"<]*+(?=[\w\W]{0,500}\b(?:DMCA|infringed)\b)
esgenv\.com
jobsatags\.com
airtviptv\.shop
Expand Down
1 change: 0 additions & 1 deletion helpers.py
@@ -1,5 +1,4 @@
# coding=utf-8
import os
import sys
import traceback
from datetime import datetime
Expand Down
1 change: 1 addition & 0 deletions watched_keywords.txt
Expand Up @@ -33321,3 +33321,4 @@
1632941385 cigien nightfxtrading\.com
1632941485 Machavity bigestfinance\.com
1632942452 cigien rich-flavours\.com
1632954810 Makyen fleetcent\.com
4 changes: 4 additions & 0 deletions ws.py
Expand Up @@ -14,6 +14,7 @@
# test it thoroughly.

import os
import atexit
import platform
# noinspection PyPackageRequirements
import websocket
Expand Down Expand Up @@ -93,6 +94,9 @@
if not GlobalVars.metasmoke_ws_host:
log('info', "No metasmoke websocket host found, which is okay if you're anti-websocket")

# Register actually_add_queue_timings_data hook
atexit.register(actually_add_queue_timings_data)

# Initiate DNS
#
# Based on additional research, at this point in the code *nothing* has done anything from a
Expand Down

0 comments on commit 0cbc68b

Please sign in to comment.