[slapos.grid] Place instance logs on instance side.

slapos/grid/slapgrid.py

@@ -39,6 +39,7 @@ import tempfile
 import time
 import traceback
 import warnings
+import logging
 
 if sys.version_info < (2, 6):
   warnings.warn('Used python version (%s) is old and has problems with'
@@ -48,6 +49,7 @@ from lxml import etree
 
 from slapos.slap.slap import NotFoundError
 from slapos.slap.slap import ServerError
+from slapos.util import mkdir_p, chownDirectory
 from slapos.grid.exception import BuildoutFailedError
 from slapos.grid.SlapObject import Software, Partition
 from slapos.grid.svcbackend import launchSupervisord
@@ -606,6 +608,23 @@ class Slapgrid(object):
           os.remove(timestamp_path)
           self.logger.exception('')
 
+    # Include Partition Logging
+    log_folder_path = "%s/.slapgrid/log" % instance_path
+    mkdir_p(log_folder_path)
+    partition_file_handler = logging.FileHandler(
+                filename="%s/instance.log" % (log_folder_path)
+            )
+    stat_info = os.stat(instance_path)
+    chownDirectory("%s/.slapgrid" % instance_path, 
+                   uid=stat_info.st_uid,
+                   gid=stat_info.st_gid)
+
+    formatter = logging.Formatter(
+       '[%(asctime)s] %(levelname)-8s %(name)s %(message)s')
+    partition_file_handler.setFormatter(formatter)
+    self.logger.addHandler(partition_file_handler)
+
+    try:
       self.logger.info('Processing Computer Partition %s.' % computer_partition_id)
       self.logger.info('  Software URL: %s' % software_url)
       self.logger.info('  Software path: %s' % software_path)
@@ -626,7 +645,6 @@ class Slapgrid(object):
         certificate_repository_path=self.certificate_repository_path,
         buildout=self.buildout,
         logger=self.logger)
-
       computer_partition_state = computer_partition.getState()
   
       # XXX this line breaks 37 tests
@@ -663,6 +681,8 @@ class Slapgrid(object):
           (computer_partition_id, computer_partition_state)
         computer_partition.error(error_string, logger=self.logger)
         raise NotImplementedError(error_string)
+    finally:
+       self.logger.removeHandler(partition_file_handler)
 
     # If partition has been successfully processed, write timestamp
     if timestamp: