move logs to 1 or 2. If 3 is used, we will also see SHM logs

Author: pliablepixels

mlapi.py

@@ -129,7 +129,7 @@ def post(self):
 
             for key in g.monitor_config[mid]:
                 # This will also take care of copying over mid specific stream_options
-                g.logger.Debug(4, 'Overriding global {} with {}...'.format(key, g.monitor_config[mid][key][:30]))
+                g.logger.Debug(2, 'Overriding global {} with {}...'.format(key, g.monitor_config[mid][key][:30]))
                 g.config[key] = g.monitor_config[mid][key]
 
             # stupid mlapi and zm_detect config incompatibility
@@ -141,12 +141,12 @@ def post(self):
 
             r = req.get('reason')
             if r and g.config['only_triggered_zm_zones'] == 'yes' and g.config['import_zm_zones'] == 'yes':
-                g.logger.Debug(4, 'Only filtering polygon names that have {}'.format(r))
+                g.logger.Debug(2, 'Only filtering polygon names that have {}'.format(r))
                 r =r.replace(' ','_').lower()
-                g.logger.Debug(4, 'Original polygons being used: {}'.format(g.polygons))
+                g.logger.Debug(2, 'Original polygons being used: {}'.format(g.polygons))
 
                 g.polygons[:] = [item for item in g.polygons if utils.findWholeWord(item['name'])(r)]
-                g.logger.Debug(4, 'Final polygons being used: {}'.format(g.polygons))
+                g.logger.Debug(2, 'Final polygons being used: {}'.format(g.polygons))
 
 
             if g.config['ml_sequence'] and g.config['use_sequence'] == 'yes':
@@ -160,8 +160,7 @@ def post(self):
                 g.logger.Debug(2,'mapping legacy ml data from config')
                 ml_options = utils.convert_config_to_ml_sequence()
 
-            g.logger.Debug (4, 'Overwriting ml_sequence of pre loaded model')
-            #g.logger.Debug (4, "REMOVE ME: NEW CONFIG: TYPE:{} ==> {}".format(type(ml_options), ml_options))
+            g.logger.Debug (2, 'Overwriting ml_sequence of pre loaded model')
             m.set_ml_options(ml_options)  
         else:
             g.logger.Debug(1,'Monitor ID not specified, or not found in mlapi config, using zm_detect overrides')
@@ -180,7 +179,7 @@ def post(self):
             #print (ml_options)
 
         if g.config.get('stream_sequence'):
-            g.logger.Debug(4, 'Found stream_sequence in mlapi config, ignoring objectconfig.ini')
+            g.logger.Debug(2, 'Found stream_sequence in mlapi config, ignoring objectconfig.ini')
             stream_options = ast.literal_eval(g.config.get('stream_sequence'))
         else:
             stream_options = req.get('stream_options')
@@ -232,7 +231,7 @@ def post(self):
             oldw = matched_data['image_dimensions']['original'][1]
 
         if config_copy:
-            g.log.Debug(4, 'Restoring global config & ml_options')
+            g.log.Debug(2, 'Restoring global config & ml_options')
             g.config = config_copy
             g.polygons = poly_copy
 
@@ -375,8 +374,6 @@ def ret_val(exception):
 else:
     zmapi = zmapi.ZMApi(options=api_options)
     utils.check_and_import_zones(zmapi)
-    #g.logger.Debug (4, 'REMOVEME: FULL LIST OF ZONES IMPORTED: {}'.format (g.monitor_polygons))
-
 
 
 ml_options = {}

modules/utils.py

@@ -37,11 +37,11 @@ def check_and_import_zones(api):
 
         # if we have a 'no' inside local monitor section, don't import 
         if mid in g.monitor_config and g.monitor_config[mid].get('import_zm_zones') == 'no':
-            g.logger.Debug(4,'Not importing zones for monitor:{} as the monitor specific section says no'.format(mid))
+            g.logger.Debug(1,'Not importing zones for monitor:{} as the monitor specific section says no'.format(mid))
             continue 
         # else if global is no, and there is no local, don't import
         elif g.config['import_zm_zones'] == 'no' and (mid not in g.monitor_config or not g.monitor_config[mid].get('import_zm_zones')):
-            g.logger.Debug(4,'Not importing zone:{} for monitor:{} as the global setting says no and there is no local override'.format(item['Zone']['Name'], mid))
+            g.logger.Debug(1,'Not importing zone:{} for monitor:{} as the global setting says no and there is no local override'.format(item['Zone']['Name'], mid))
             continue
 
         # At this stage, global is 'yes' and local is either unspecified or has 'yes'
@@ -51,7 +51,7 @@ def check_and_import_zones(api):
             g.monitor_polygons[mid] = []
 
         if item['Zone']['Type'] == 'Inactive':
-            g.logger.Debug(2, 'Skipping {} as it is inactive'.format(item['Zone']['Name']))
+            g.logger.Debug(1, 'Skipping {} as it is inactive'.format(item['Zone']['Name']))
             continue
 
         item['Zone']['Name'] = item['Zone']['Name'].replace(' ','_').lower()
@@ -299,13 +299,13 @@ def _set_config_val(k,v):
                     ml = config_file.get('ml', 'ml_sequence')
                     g.monitor_config[mid]['ml_sequence']=ml
                 except:
-                    g.logger.Debug (4, 'ml sequence not found in globals')
+                    g.logger.Debug (2, 'ml sequence not found in globals')
 
                 try:
                     ss = config_file.get('ml', 'stream_sequence')
                     g.monitor_config[mid]['stream_sequence']=ss
                 except:
-                    g.logger.Debug (4, 'stream sequence not found in globals')
+                    g.logger.Debug (2, 'stream sequence not found in globals')
 
                 for item in config_file[sec].items():
                     k = item[0]
@@ -318,7 +318,7 @@ def _set_config_val(k,v):
                     else:
                         if k in g.config_vals:
                         # This means its a legit config key that needs to be overriden
-                            g.logger.Debug(4,'[{}] overrides key:{} with value:{}'.format(sec, k, v))
+                            g.logger.Debug(2,'[{}] overrides key:{} with value:{}'.format(sec, k, v))
                             g.monitor_config[mid][k]=_correct_type(v,g.config_vals[k]['type'])
                            # g.monitor_config[mid].append({ 'key':k, 'value':_correct_type(v,g.config_vals[k]['type'])})
                         else:
@@ -343,16 +343,14 @@ def _set_config_val(k,v):
                     if k in g.config_vals:
                         _set_config_val(k,g.config_vals[k] )
                     else:
-                        #g.logger.Debug(4, 'storing unknown attribute {}={}'.format(k,v))
                         g.config[k] = v 
-                        #_set_config_val(k,{'section': sec, 'default': None, 'type': 'string'} )
 
 
 
 
         # Parameter substitution
 
-        g.logger.Debug (4,'Doing parameter substitution for globals')
+        g.logger.Debug (2,'Doing parameter substitution for globals')
         p = r'{{(\w+?)}}'
         for gk, gv in g.config.items():
             #input ('Continue')
@@ -369,11 +367,11 @@ def _set_config_val(k,v):
                         g.config[gk] = new_val
                         gv = new_val
                     else:
-                        g.logger.Debug(4, 'substitution key: {} not found'.format(match_key))
+                        g.logger.Debug(2, 'substitution key: {} not found'.format(match_key))
                 if not replaced:
                     break
 
-        g.logger.Debug (4,'Doing parameter substitution for monitor specific entities')
+        g.logger.Debug (2,'Doing parameter substitution for monitor specific entities')
         p = r'{{(\w+?)}}'
         for mid in g.monitor_config:
             for key in g.monitor_config[mid]:
@@ -398,7 +396,7 @@ def _set_config_val(k,v):
                             gv = new_val
                             g.monitor_config[mid][key] = gv
                         else:
-                            g.logger.Debug(4, 'substitution key: {} not found'.format(match_key))
+                            g.logger.Debug(2, 'substitution key: {} not found'.format(match_key))
                     if not replaced:
                         break