boot updates

cupid/actions.py

@@ -73,7 +73,8 @@ def __init__(self, actiondict):
             'offdelay':0,
             'activereset':True,
             'actionfrequency': 0.0,  # 0 means all the time.
-            'action_window': 60.0
+            'action_window': 60.0,
+            'log_path':None
         }
         settings.update(actiondict)
         for key, value in settings.items():
@@ -100,6 +101,11 @@ def __init__(self, actiondict):
             """
         self.statusmsg = ''
 
+    def log(self, message, reqloglevel=1, currloglevel=1):
+        from iiutilities.utility import log
+        if self.log_path:
+            log(self.log_path, message, reqloglevel, currloglevel)
+
     def determine_status(self):
         from iiutilities import dblib, datalib
 
@@ -126,8 +132,8 @@ def determine_status(self):
                 self.status = int(datalib.calcastevalformula(str(self.value) + self.actiondatadict['operator'] + self.actiondatadict['criterion']))
             # Should really throw an error here.
             except:
-                print('ERROR in asteval')
-                print(str(self.value) + self.actiondatadict['operator'] + self.actiondatadict['criterion'])
+                self.log('ERROR in asteval')
+                self.log(str(self.value) + self.actiondatadict['operator'] + self.actiondatadict['criterion'])
                 self.status = 0
 
         elif self.conditiontype == 'channel':
@@ -562,6 +568,7 @@ def processactions(**kwargs):
             if actiondict['name'] != kwargs['name']:
                 continue
 
+        actiondict['log_path'] = pilib.dirs.logs.actions
         thisaction = action(actiondict)
         thisaction.process()
         thisaction.publish()

cupid/boot.py

@@ -178,10 +178,11 @@ def runboot():
         utility.log(pilib.dirs.logs.system, 'boot: running boot netconfig', 2, pilib.loglevels.system)
         runconfig(onboot=True)
 
+    # THIS IS NOW IN cupid_daemon.service
     # Run daemon
-    from cupiddaemon import rundaemon
+    # from cupiddaemon import rundaemon
 
-    rundaemon()
+    # rundaemon()
 
     # Update hardware version in table
     # from systemstatus import readhardwarefileintoversions

cupid/pilib.py

@@ -73,6 +73,7 @@
 dirs.logs.system = dirs.log + 'systemstatus.log'
 dirs.logs.control = dirs.log + 'control.log'
 dirs.logs.daemon = dirs.log + 'daemon.log'
+dirs.logs.actions = dirs.log + 'actions.log'
 dirs.logs.serial = dirs.log + 'serial.log'
 dirs.logs.notifications = dirs.log + 'notifications.log'
 dirs.logs.daemonproc = dirs.log + 'daemonproc.log'
@@ -112,6 +113,7 @@ def __init__(self, *args, **kwargs):
 loglevels.control = 4
 loglevels.daemon = 3
 loglevels.serial = 2
+loglevels.actions = 2
 loglevels.notifications = 5
 
 daemonprocs = ['cupid/periodicupdateio.py', 'cupid/picontrol.py', 'cupid/systemstatus.py', 'cupid/sessioncontrol.py', 'mote/serialhandler.py']

cupid/systemstatus.py

@@ -22,29 +22,29 @@
     import simplejson as json
 except:
     import json
-#
-# def readhardwarefileintoversions():
-#
-#     from iiutilities import utility
-#     from cupid import pilib
-#     from iiutilities import dblib
-#
-#     devicefile = '/var/wwwsafe/devicedata'
-#     try:
-#         file = open(devicefile)
-#         lines = file.readlines()
-#         devicedict = {}
-#         for line in lines:
-#             split = line.split(':')
-#             try:
-#                 devicedict[split[0].strip()] = split[1].strip()
-#             except:
-#                 utility.log(pilib.dirs.logs.system, 'Device data parse error', 1, pilib.loglevels.system)
-#         dblib.sqlitequery(pilib.dirs.dbs.system,
-#                           dblib.makesqliteinsert('versions', ['hardware', devicedict['hardware']], ['item', 'version']))
-#     except:
-#         utility.log(pilib.dirs.logs.system, 'Error opening devicedata file to parse', 1,
-#                       pilib.loglevels.system)
+
+def readhardwarefileintoversions():
+
+    from iiutilities import utility
+    from cupid import pilib
+    from iiutilities import dblib
+
+    devicefile = '/var/wwwsafe/devicedata'
+    try:
+        file = open(devicefile)
+        lines = file.readlines()
+        devicedict = {}
+        for line in lines:
+            split = line.split(':')
+            try:
+                devicedict[split[0].strip()] = split[1].strip()
+            except:
+                utility.log(pilib.dirs.logs.system, 'Device data parse error', 1, pilib.loglevels.system)
+        dblib.sqlitequery(pilib.dirs.dbs.system,
+                          dblib.makesqliteinsert('versions', ['hardware', devicedict['hardware']], ['item', 'version']))
+    except:
+        utility.log(pilib.dirs.logs.system, 'Error opening devicedata file to parse', 1,
+                      pilib.loglevels.system)
 
 
 def updateiwstatus():
@@ -707,7 +707,8 @@ def run_system_status(**kwargs):
 
     settings = {
         'debug':False,
-        'quiet':False
+        'quiet':False, 
+        'force':True
     }
     settings.update(kwargs)
 
@@ -749,7 +750,7 @@ def run_system_status(**kwargs):
     # allnetstatus = updatenetstatus(lastnetstatus, quiet=settings['quiet'])
 
     # Keep reading system status?
-    while systemstatus['systemstatusenabled']:
+    while systemstatus['systemstatusenabled'] or settings['force']:
 
         # Run notifications
         pilib.process_notifications_queue()
@@ -777,8 +778,6 @@ def run_system_status(**kwargs):
         Then, if status is not 'ok', we will reconfigure interface.
         """
 
-        allnetstatus = update_net_status(lastnetstatus, quiet=settings['quiet'])
-
         if systemstatus['netstatusenabled']:
             utility.log(pilib.dirs.logs.system, 'Beginning network routines. ', 3, pilib.loglevels.system)
 
@@ -894,11 +893,15 @@ def run_system_status(**kwargs):
 if __name__ == '__main__':
     runonce = False
     debug = False
+    force = False
     if 'runonce' in sys.argv:
         print('run once selected')
         runonce = True
     if 'debug' in sys.argv:
         print('debug selected')
         debug = True
-    run_system_status(runonce=runonce, debug=debug)
+    if 'force' in sys.argv:
+        print('force selected')
+        force = True
+    run_system_status(runonce=runonce, debug=debug, force=force)
     # runsystemstatus()

iiutilities/dblib.py

@@ -18,14 +18,10 @@
 if top_folder not in sys.path:
     sys.path.insert(0, top_folder)
 
-
 """
-
 Database tools
-
 """
 
-
 class sqliteDatabase(object):
 
     def __init__(self, path, **kwargs):
@@ -2086,7 +2082,8 @@ def create_table(self, tablename, table_schema, **kwargs):
         settings = {
             'replace': True,
             'queue': False,
-            'collate':None
+            'collate':None,
+            'debug':False
         }
         settings.update(kwargs)
 
@@ -2112,6 +2109,11 @@ def create_table(self, tablename, table_schema, **kwargs):
 
         if settings['collate']:
             query += ' collate {}'.format(settings['collate'])
+
+
+        if settings['debug']:
+            print(query)
+
         if settings['queue']:
             self.queue_queries([query])
         else:

iiutilities/utility.py

@@ -65,7 +65,7 @@ def split_time_log(log, **kwargs):
             if settings['division'] == 'day':
                 import time
                 if settings['format'] == 'datetimestring':
-                    from datalib import timestring_to_struct
+                    from iiutilities.datalib import timestring_to_struct
                     the_time = timestring_to_struct(listitem['time'])
                 criterion = time.struct_time((the_time.tm_year, the_time.tm_mon, the_time.tm_mday, 0, 0, 0, 0, 1, 0))
                 # criterion = (time.tm_year, time.tm_mon, time.tm_mday)
@@ -92,7 +92,7 @@ def split_time_db(path, **kwargs):
     settings.update(kwargs)
 
     from iiutilities import dblib
-    from datalib import gettimestring
+    from iiutilities.datalib import gettimestring
     import time
 
     database = dblib.sqliteDatabase(path)
@@ -210,8 +210,8 @@ def split_time_db(path, **kwargs):
 
 def split_and_trim_db_by_date(logpath, **kwargs):
 
-    import dblib
-    from datalib import gettimestring
+    from iiutilities import dblib
+    from iiutilities.datalib import gettimestring
     import time
 
     settings = {