logging

2 files changed, 6 insertions, 22 deletions

diff --git a/distbuild/build_controller.py b/distbuild/build_controller.py
index 0230968d..0d498cd4 100644
--- a/distbuild/build_controller.py
+++ b/distbuild/build_controller.py
@@ -313,6 +313,8 @@ class BuildController(distbuild.StateMachine):
             
             text = self._artifact_data.peek()
             try:
+                with open('/home/adam/morph/build-graph', 'a') as f:
+                    f.write(text)
                 artifact = distbuild.deserialise_artifact(text)
             except ValueError, e:
                 logging.error(traceback.format_exc())
diff --git a/distbuild/serialise.py b/distbuild/serialise.py
index 32ed334f..6cbc8fbc 100644
--- a/distbuild/serialise.py
+++ b/distbuild/serialise.py
@@ -46,21 +46,6 @@ class ArtifactReference(object):
     def __repr__(self):
         return 'REF: %s' % self.basename()
 
-#        ret = ['\n-----', self.basename()]
-#        for key, val in self._dict.iteritems():
-#            if key == 'dependencies':
-#                ret.append('dependencies:')
-#                for dep in self.dependencies:
-#                    ret.append('* %s - %s' % (type(dep), dep.basename()))
-#            elif key == 'source_artifacts':
-#                ret.append('source_artifacts:')
-#                for dep in self.source_artifacts:
-#                    ret.append('* %s' % dep)
-#            else:
-#                ret.append('%s: %s' % (key, val))
-#        ret.append('\n-----')
-#        return '\n'.join(ret)
-
     def basename(self):
         return self._basename
 
@@ -68,9 +53,7 @@ class ArtifactReference(object):
 def serialise_artifact(artifact, repo, ref):
     '''Serialise an Artifact object and its dependencies into string form.'''
 
-    log = open('/home/adam/serialise-%s' % artifact.basename(), 'w+')
     def encode_artifact(a):
-        log.write('\nSERIALISE: serialising %s\n' % a.basename())
         if artifact.source.morphology['kind'] == 'system': # pragma: no cover
             arch = artifact.source.morphology['arch']
         else:
@@ -98,7 +81,6 @@ def serialise_artifact(artifact, repo, ref):
         return a_dict
 
     def encode_artifact_reference(a):
-        log.write('SERIALISE: serialising reference: %s\n' % a.basename())
         a_dict = dict(a._dict)
         a_dict['dependencies'] = [dep.basename() for dep in a.dependencies]
         a_dict['source_artifacts'] = [str(sa) for sa in a.source_artifacts]
@@ -112,7 +94,6 @@ def serialise_artifact(artifact, repo, ref):
             handle_artifact_reference(dep)
         encoded_artifacts[a.basename()] = encode_artifact_reference(a)
 
-    log.write('\n\nSERIALISE: %s\n' % artifact.basename())
     encoded_artifacts = {}
     visited_artifacts = {}
 
@@ -122,15 +103,16 @@ def serialise_artifact(artifact, repo, ref):
                 encoded_artifacts[a.basename()] = encode_artifact(a)
                 visited_artifacts[artifact.basename()] = artifact
     elif isinstance(artifact, ArtifactReference):
-#        handle_artifact_reference(artifact)
         encoded_artifacts[artifact.basename()] = encode_artifact_reference(artifact)
 
     content = {
         'root-artifact': artifact.basename(),
         'artifacts': encoded_artifacts
     }
-    log.write('\n\nSERIALISE: done %s\n' % artifact.basename())
-    return json.dumps(yaml.dump(content))
+    logging.debug('SERIALISE: dumping content')
+    ret = json.dumps(yaml.dump(content))
+    logging.debug('SERIALISE: dumped')
+    return ret
 
 
 def deserialise_artifact(encoded):