Merge lp:~bac/charms/oneiric/buildbot-slave/bbs into lp:~yellow/charms/oneiric/buildbot-slave/trunk

[Brad Crittenden]

Standardize calling of main and logging entry/exit.

Add some more log output.

[Gary Poster (gary)]

review: Approve

=== modified file 'hooks/buildbot-relation-changed'
--- hooks/buildbot-relation-changed	2012-02-07 12:33:51 +0000
+++ hooks/buildbot-relation-changed	2012-02-08 20:30:27 +0000
@@ -8,6 +8,8 @@
 from helpers import (
     get_config,
     log,
+    log_entry,
+    log_exit,
     relation_get,
     )
 from local import (
@@ -30,6 +32,7 @@
 def main():
     name = relation_get('name')
     passwd = relation_get('passwd')
+    log("name {} password {}".format(name, passwd))
     if name and passwd:
         # We heard back from the master and we are ready to start.
         config = get_config()
@@ -39,5 +42,8 @@
 
 
 if __name__ == '__main__':
-    log('BUILDBOT-RELATION-CHANGED HOOK:')
-    main()
+    log_entry()
+    try:
+        main()
+    finally:
+        log_exit()

=== modified file 'hooks/buildbot-relation-joined'
--- hooks/buildbot-relation-joined	2012-02-07 12:33:51 +0000
+++ hooks/buildbot-relation-joined	2012-02-08 20:30:27 +0000
@@ -6,6 +6,8 @@
 from helpers import (
     get_config,
     log,
+    log_entry,
+    log_exit,
     relation_set,
     )
 
@@ -24,5 +26,8 @@
 
 
 if __name__ == '__main__':
-    log('BUILDBOT-RELATION-JOINED HOOK:')
-    main()
+    log_entry()
+    try:
+        main()
+    finally:
+        log_exit()

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-02-07 15:55:26 +0000
+++ hooks/config-changed	2012-02-08 20:30:27 +0000
@@ -9,6 +9,8 @@
     get_config,
     install_extra_repository,
     log,
+    log_entry,
+    log_exit,
     )
 from local import (
     config_json,
@@ -42,5 +44,8 @@
 
 
 if __name__ == '__main__':
-    log('CONFIG-CHANGED HOOK:')
-    main()
+    log_entry()
+    try:
+        main()
+    finally:
+        log_exit()

=== modified file 'hooks/install'
--- hooks/install	2012-02-07 15:55:26 +0000
+++ hooks/install	2012-02-08 20:30:27 +0000
@@ -8,6 +8,8 @@
     command,
     get_config,
     log,
+    log_entry,
+    log_exit,
     )
 import os
 import shlex
@@ -85,5 +87,8 @@
 
 
 if __name__ == '__main__':
-    log('INSTALL HOOK:')
-    main()
+    log_entry()
+    try:
+        main()
+    finally:
+        log_exit()