Changeset f07fa49 for fedd/federation/access.py

Timestamp:

Sep 8, 2009 5:57:00 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02

Children:

40dd8c1

Parents:

430e98d

Message:

better logging and cleanup

File:

• fedd/federation/access.py (modified) (5 diffs)

fedd/federation/access.py

@@ -22 +22 @@
 
 import topdl
+import list_log
 import httplib
 import tempfile
@@ -782 +783 @@
                         msg = { 'ReleaseProjectRequestBody' : msg}
                         self.allocate_project.release_project(msg)
+                # And remove the access cert
+                cf = "%s/%s.pem" % (self.certdir, aid)
+                self.log.debug("Removing %s" % cf)
+                os.remove(cf)
                 return { 'allocID': req['allocID'] } 
             else:
@@ -1340 +1345 @@
                 user = self.allocation[aid].get('user', None)
                 self.allocation[aid]['experiment'] = ename
+                self.allocation[aid]['log'] = [ ]
+                # Create a logger that logs to the experiment's state object as
+                # well as to the main log file.
+                alloc_log = logging.getLogger('fedd.access.%s' % ename)
+                h = logging.StreamHandler(
+                        list_log.list_log(self.allocation[aid]['log']))
+                # XXX: there should be a global one of these rather than
+                # repeating the code.
+                h.setFormatter(logging.Formatter(
+                    "%(asctime)s %(name)s %(message)s",
+                            '%d %b %y %H:%M:%S'))
+                alloc_log.addHandler(h)
                 self.write_state()
             self.state_lock.release()
@@ -1357 +1374 @@
             self.generate_ns2(topo, expfile, 
                     "/proj/%s/software/%s/" % (proj, ename), master)
+
             starter = self.start_segment(keyfile=self.ssh_privkey_file, 
-                    debug=self.create_debug)
+                    debug=self.create_debug, log=alloc_log)
             rv = starter(self, ename, proj, user, expfile, tmpdir)
         except service_error, e:
@@ -1373 +1391 @@
 
         if rv:
-            return { 'allocID': req['allocID'] }
+            # Grab the log (this is some anal locking, but better safe than
+            # sorry)
+            self.state_lock.acquire()
+            logv = "".join(self.allocation[aid]['log'])
+            self.state_lock.release()
+
+            return { 'allocID': req['allocID'], 'allocationLog': logv }
         elif err:
             raise service_error(service_error.federant,