integrated changes from v1.5

flowspec/junos.py

@@ -229,11 +229,9 @@ def translate_frag_list(frag_list):
 def get_frag(rule):
     result=''
     if rule.fragmenttype:
-      tmp1 = translate_frag_list(rule.fragmenttype.all())
-      if tmp1!="":
-        result = ',frag'+tmp1
-      else:
-        result = ''
+      tmp = translate_frag_list(rule.fragmenttype.all())
+      if tmp != "":
+        result = ',frag'+tmp
     return result
 
 def create_junos_name(rule):

flowspec/snmpstats.py

@@ -210,6 +210,16 @@ def helper_rule_ts_parse(ts_string):
   except Exception as e:
     logger.info("helper_rule_ts_parse(): ts_string="+str(ts_string)+": got exception "+str(e))
     ts = None
+
+  if ts==None: # other db may hav other time fmt:
+    logger.info("helper_rule_ts_parse(): trying with milli seconds fmt")
+    try:
+      ts = datetime.strptime(ts_string, '%Y-%m-%d %H:%M:%S.%f+00:00') # TODO TZ offset assumed to be 00:00
+    except Exception as e:
+      logger.info("helper_rule_ts_parse(): ts_string="+str(ts_string)+": got exception "+str(e))
+      ts = None
+    
+  logger.info("helper_rule_ts_parse(): => ts="+str(ts))
   return ts
 
 def process_new_snmp_measurements__low_level(nowstr, samplecount, newdata, history):

flowspec/views.py

@@ -58,7 +58,8 @@ LOG_FILENAME = os.path.join(settings.LOG_FILE_LOCATION, 'gunicorn_views.log')
 # FORMAT = '%(asctime)s %(levelname)s: %(message)s'
 # logging.basicConfig(format=FORMAT)
 #formatter = logging.Formatter('%(asctime)s %(levelname)s %(clientip)s %(user)s: %(message)s') # leads to strange errors on test-lab
-formatter = logging.Formatter('%(asctime)s %(levelname)s: %(message)s') 
+#formatter = logging.Formatter('%(asctime)s %(levelname)s %(user)s: %(message)s')
+formatter = logging.Formatter('%(asctime)s %(levelname)s: %(message)s')
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)