Merge branch 'master' into datarestructure

This commit is contained in:
2019-08-19 20:19:42 +01:00
16 changed files with 273 additions and 118 deletions

View File

@@ -2,6 +2,8 @@ import json
import pickle
from redis import StrictRedis
from string import digits
from os import urandom
from utils.logging.log import *
configPath = "conf/"
@@ -33,6 +35,10 @@ CommandMap = {}
runningSample = 0
lastMinuteSample = 0
# Generate 16-byte hex key for message checksums
hashKey = urandom(16)
lastEvents = {}
def nets():
if not "pool" in globals():
return