diff --git a/py/mules/syslog.py b/py/mules/syslog.py index 83a67bf..056f69c 100644 --- a/py/mules/syslog.py +++ b/py/mules/syslog.py @@ -118,7 +118,7 @@ class SyslogUDPHandler(socketserver.BaseRequestHandler): db_AA.Account.add_log(dev.id, info[0], info[1], info[3],message,ctype, address[0], info[5]) elif "rebooted" in message: db_events.state_event(dev.id, "syslog", "Router Rebooted","info",1,info[0]) - elif "resetting system configuration": + elif "resetting system configuration" in message: db_events.state_event(dev.id, "syslog", "Router reset","info",1,info[0]) else: regex = r"system,info mikrowizard\d+: (.*) (changed|added|removed|unscheduled) by (.*)" diff --git a/py/mules/updater.py b/py/mules/updater.py index 22cea73..e1afd24 100644 --- a/py/mules/updater.py +++ b/py/mules/updater.py @@ -74,6 +74,12 @@ def extract_zip_reload(filename,dst): def main(): while True: + try: + from libs import utilpro + ISPRO=True + except ImportError: + ISPRO=False + pass next_hour = (time.time() // 3600 + 1) * 3600 sleep_time = next_hour - time.time() # Code to be executed every hour @@ -101,7 +107,8 @@ def main(): params={ "serial_number": hwid, "username": username.strip(), - "version": __version__ + "version": __version__, + "ISPRO":ISPRO } res=False url="http://mikrowizard.com/wp-json/mikrowizard/v1/get_update"