More generic logging approach

3 files changed, 17 insertions, 28 deletions

diff --git a/commands/build b/commands/build
index 71c69be..a8405c8 100755
--- a/commands/build
+++ b/commands/build
@@ -1,15 +1,18 @@
-#!/bin/bash
+#!/usr/bin/python -u
 
-commandsdir=`dirname "$0"`
-rootdir=`dirname "$commandsdir"`
-logsdir=$rootdir/logs
-helpersdir=$commandsdir/helpers
+import argparse
 
-timestamp=`date +%Y%m%d-%H%M%S`
-logfile=$logsdir/build-$timestamp.log
+import common
 
-mkdir -p $logsdir
+from devbot import build
 
-PYTHONPATH=$commandsdir $helpersdir/build $@ | tee -a $logfile
+parser = argparse.ArgumentParser()
+parser.add_argument("module", nargs="?", help="name of the module to build")
+args = parser.parse_args()
 
-exit ${PIPESTATUS[0]} 
+common.setup()
+
+if args.module:
+    build.build_one(args.module)
+else:
+    build.build()
diff --git a/commands/common.py b/commands/common.py
index b26e192..9a8ef41 100644
--- a/commands/common.py
+++ b/commands/common.py
@@ -9,6 +9,7 @@ sys.path.append(base_dir)
 from devbot import system
 from devbot import config
 from devbot import distro
+from devbot import command
 
 def setup():
     config.load_plugins()
@@ -16,6 +17,7 @@ def setup():
     relocatable = "SUGAR_BUILDBOT" in os.environ
     logs_dir = os.path.join(base_dir, "logs")
     install_dir = os.path.join(base_dir, "install")
+    tools_dir = os.path.join(base_dir, "tools")
 
     config.set_devbot_dir(os.path.join(base_dir, "devbot"))
     config.set_config_dir(os.path.join(base_dir, "config"))
@@ -52,3 +54,5 @@ def setup():
         package_files.append("buildslave")
 
     config.set_package_files(package_files)
+
+    command.set_logger(os.path.join(tools_dir, "log-command"))
diff --git a/commands/helpers/build b/commands/helpers/build
deleted file mode 100755
index a8405c8..0000000
--- a/commands/helpers/build
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/python -u
-
-import argparse
-
-import common
-
-from devbot import build
-
-parser = argparse.ArgumentParser()
-parser.add_argument("module", nargs="?", help="name of the module to build")
-args = parser.parse_args()
-
-common.setup()
-
-if args.module:
-    build.build_one(args.module)
-else:
-    build.build()