Changeset 1856

Timestamp:

02/11/08 13:49:09 (2 months ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11138

Message:

The childapp log file was being opened twice, once in the main thread and once in the capture thread.
This fix removes the open in the main thread.

Also the application log is timestamped as it is difficult to debug when the file is overwritten.

Files:

• freevo/src/childapp.py (modified) (7 diffs)

freevo/src/childapp.py

@@ -85 +85 @@
 
             command = ('%s %s' % (config.RUNAPP, app)).strip()
-            debug_name = app[:app.find(' ')]
+            app_name = app[:app.find(' ')]
 
         else:
@@ -104 +104 @@
                 command = app
 
-            debug_name = app[0]
-
-        if debug_name.rfind('/') > 0:
-            debug_name = debug_name[debug_name.rfind('/')+1:]
+            app_name = app[0]
+
+        if app_name.rfind('/') > 0:
+            app_name = app_name[app_name.rfind('/')+1:]
         else:
-            debug_name = debug_name
+            app_name = app_name
 
         if debugname:
-            debug_name = debugname
+            app_name = debugname
 
         if doeslogging or config.DEBUG_CHILDAPP:
             doeslogging = 1
-
-        if doeslogging:
-            stdout_logger = os.path.join(config.FREEVO_LOGDIR, '%s-stdout-%s.log' % (debug_name, os.getuid()))
-            try:
-                self.stdout_log = open(stdout_logger, 'w')
-            except OSError, why:
-                _debug_('Cannot open "%s": %s' % (stdout_logger, why), DWARNING)
-                self.stdout_log = None
-
-            stderr_logger = os.path.join(config.FREEVO_LOGDIR, '%s-stderr-%s.log' % (debug_name, os.getuid()))
-            try:
-                self.stderr_log = open(stderr_logger, 'w')
-            except OSError, why:
-                _debug_('Cannot open "%s": %s' % (stderr_logger, why), DWARNING)
-                self.stderr_log = None
-        else:
-            self.stdout_log = None
-            self.stderr_log = None
 
         command_isstr = isinstance(command, str)
@@ -157 +139 @@
             return
 
-        self.so = Read_Thread('stdout', self.child.stdout, self.stdout_cb, debug_name, doeslogging, callback_use_rc)
+        self.so = Read_Thread('stdout', self.child.stdout, self.stdout_cb, app_name, doeslogging, callback_use_rc)
         self.so.setDaemon(1)
         self.so.start()
 
-        self.se = Read_Thread('stderr', self.child.stderr, self.stderr_cb, debug_name, doeslogging, callback_use_rc)
+        self.se = Read_Thread('stderr', self.child.stderr, self.stderr_cb, app_name, doeslogging, callback_use_rc)
         self.se.setDaemon(1)
         self.se.start()
@@ -238 +220 @@
                 _debug_('killed %s the easy way, status %s' % (self.child.pid, self.status))
                 if not self.child.stdin.closed: self.child.stdin.close()
-                if self.stdout_log: self.stdout_log.close()
-                if self.stderr_log: self.stderr_log.close()
                 self.child = None
                 return
@@ -301 +281 @@
             self.lock.release()
         if not self.child.stdin.closed: self.child.stdin.close()
-        if self.stdout_log: self.stdout_log.close()
-        if self.stderr_log: self.stderr_log.close()
         self.child = None
 
@@ -391 +369 @@
     Thread for reading stdout or stderr from the child
     """
-    def __init__(self, name, fh, callback, logger=None, doeslogging=0, callback_use_rc=True):
+    def __init__(self, name, fh, callback, appname=None, doeslogging=0, callback_use_rc=True):
         """
         Constructor of Read_Thread
         """
-        _debug_('Read_Thread.__init__(name=%r, fh=%r, callback=%r, logger=%r, doeslogging=%r' % \
-            (name, fh, callback, logger, doeslogging), 2)
+        _debug_('Read_Thread.__init__(name=%r, fh=%r, callback=%r, appname=%r, doeslogging=%r, callback_use_rc=%r)' % \
+            (name, fh, callback, appname, doeslogging, callback_use_rc), 2)
         threading.Thread.__init__(self)
         self.name = name
@@ -403 +381 @@
         self.callback_use_rc = callback_use_rc
         self.logger = None
-        if logger and doeslogging:
-            logfile = os.path.join(config.FREEVO_LOGDIR, '%s-%s-%s.log' % (logger, name, os.getuid()))
+        if appname and doeslogging:
+            t = time.strftime('%s')
+            logfile = os.path.join(config.FREEVO_LOGDIR, '%s-%s-%s-%s.log' % (appname, name, os.getuid(), t))
             try:
                 try: