allow config-less operation

3 files changed, 41 insertions, 22 deletions

diff --git a/python/skytools/__init__.py b/python/skytools/__init__.py
index 89884095..c653c039 100644
--- a/python/skytools/__init__.py
+++ b/python/skytools/__init__.py
@@ -17,6 +17,6 @@ __all__ = (psycopgwrapper.__all__
         + gzlog.__all__
         + scripting.__all__
         + sqltools.__all__
-        + parsing.__all__
-        + quoting.__all__ )
+        + quoting.__all__
+        + parsing.__all__)
 
diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py
index 08412926..cb6ee802 100644
--- a/python/skytools/scripting.py
+++ b/python/skytools/scripting.py
@@ -88,7 +88,7 @@ def run_single_process(runnable, daemon, pidfile):
 _log_config_done = 0
 _log_init_done = {}
 
-def _init_log(job_name, cf, log_level):
+def _init_log(job_name, service_name, cf, log_level):
     """Logging setup happens here."""
     global _log_init_done, _log_config_done
 
@@ -100,13 +100,14 @@ def _init_log(job_name, cf, log_level):
         # python logging.config braindamage:
         # cannot specify external classess without such hack
         logging.skylog = skytools.skylog
+        skytools.skylog.set_service_name(service_name)
 
         # load general config
         list = ['skylog.ini', '~/.skylog.ini', '/etc/skylog.ini']
         for fn in list:
             fn = os.path.expanduser(fn)
             if os.path.isfile(fn):
-                defs = {'job_name': job_name}
+                defs = {'job_name': job_name, 'service_name': service_name}
                 logging.config.fileConfig(fn, defs)
                 got_skylog = 1
                 break
@@ -268,17 +269,13 @@ class DBScript(object):
         if len(self.args) < 1:
             print "need config file"
             sys.exit(1)
-        conf_file = self.args[0]
 
-        # load config
-        self.cf = Config(self.service_name, conf_file)
-        self.job_name = self.cf.get("job_name", self.service_name)
-        self.pidfile = self.cf.getfile("pidfile", '')
-        
+        # read config file
+        self.cf = self.load_config()
         self.reload()
 
         # init logging
-        self.log = _init_log(self.job_name, self.cf, self.log_level)
+        self.log = _init_log(self.job_name, self.service_name, self.cf, self.log_level)
 
         # send signal, if needed
         if self.options.cmd == "kill":
@@ -288,6 +285,10 @@ class DBScript(object):
         elif self.options.cmd == "reload":
             self.send_signal(signal.SIGHUP)
 
+    def load_config(self):
+        conf_file = self.args[0]
+        return Config(self.service_name, conf_file)
+
     def init_optparse(self, parser = None):
         """Initialize a OptionParser() instance that will be used to 
         parse command line arguments.
@@ -358,6 +359,8 @@ class DBScript(object):
     def reload(self):
         "Reload config."
         self.cf.reload()
+        self.job_name = self.cf.get("job_name", self.service_name)
+        self.pidfile = self.cf.getfile("pidfile", '')
         self.loop_delay = self.cf.getfloat("loop_delay", 1.0)
 
     def hook_sighup(self, sig, frame):
@@ -410,11 +413,9 @@ class DBScript(object):
         if cache in self.db_cache:
             dbc = self.db_cache[cache]
         else:
-            if connstr:
-                loc = connstr
-            else:
-                loc = self.cf.get(dbname)
-            dbc = DBCachedConn(cache, loc, max_age)
+            if not connstr:
+                connstr = self.cf.get(dbname)
+            dbc = DBCachedConn(cache, connstr, max_age)
             self.db_cache[cache] = dbc
 
         return dbc.get_connection(autocommit, isolation_level)
@@ -506,7 +507,7 @@ class DBScript(object):
                        str(tb), repr(traceback.format_tb(tb))))
             del tb
             self.reset()
-            if self.looping:
+            if self.looping and not self.do_single_loop:
                 time.sleep(20)
                 return 1
 
diff --git a/python/skytools/skylog.py b/python/skytools/skylog.py
index 852d645b..08b00bed 100644
--- a/python/skytools/skylog.py
+++ b/python/skytools/skylog.py
@@ -7,6 +7,11 @@ import logging, logging.handlers
 from skytools.psycopgwrapper import connect_database
 from skytools.quoting import quote_json
 
+_service_name = 'unknown_svc'
+def set_service_name(service_name):
+    global _service_name
+    _service_name = service_name
+
 
 # configurable file logger
 class EasyRotatingFileHandler(logging.handlers.RotatingFileHandler):
@@ -36,8 +41,8 @@ class UdpLogServerHandler(logging.handlers.DatagramHandler):
         '"level": "%s",\n\t'\
         '"thread": null,\n\t'\
         '"message": %s,\n\t'\
-        '"properties": {"application":"%s", "hostname":"%s"}\n'\
-        '}'
+        '"properties": {"application":"%s", "apptype": "%s", "type": "sys", "hostname":"%s", "hostaddr": "%s"}\n'\
+        '}\n'
 
     # cut longer msgs
     MAXMSG = 1024
@@ -49,10 +54,23 @@ class UdpLogServerHandler(logging.handlers.DatagramHandler):
         if len(msg) > self.MAXMSG:
             msg = msg[:self.MAXMSG]
         txt_level = self._level_map.get(record.levelno, "ERROR")
-        pkt = self._log_template % (time.time()*1000, txt_level,
-                quote_json(msg), record.name, socket.gethostname())
+        hostname = socket.gethostname()
+        try:
+            hostaddr = socket.gethostbyname(hostname)
+        except:
+            hostaddr = "0.0.0.0"
+        jobname = record.name
+        svcname = _service_name
+        pkt = self._log_template % (time.time()*1000, txt_level, quote_json(msg),
+                jobname, svcname, hostname, hostaddr)
         return pkt
 
+    def send(self, s):
+        """Disable socket caching."""
+        sock = self.makeSocket()
+        sock.sendto(s, (self.host, self.port))
+        sock.close()
+
 class LogDBHandler(logging.handlers.SocketHandler):
     """Sends log records into PostgreSQL server.
 
@@ -98,7 +116,7 @@ class LogDBHandler(logging.handlers.SocketHandler):
         In this case its not socket but database connection."""
 
         db = connect_database(self.connect_string)
-        db.autocommit(1)
+        db.set_isolation_level(0) # autocommit
         return db
 
     def emit(self, record):