WIP: screp gbp-specific logging

Change-Id: I39cfb5c3727b5828e63c7932f1dbc0b926d5bf99
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/obs_service_gbp/__init__.py b/obs_service_gbp/__init__.py
index bfb57d9514a981e0c402afb16c075fbe92cc95a2..43cb263440480ef1bbe253d11af8db40f806e31b 100644 (file)
--- a/obs_service_gbp/__init__.py
+++ b/obs_service_gbp/__init__.py
@@ -17,11 +17,3 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 """Helpers for the git-buildpackage OBS source service"""
-
-import gbp.log as gbplog
-
-
-# Setup logging
-LOGGER = gbplog.getLogger('source_service')
-LOGGER.setLevel(gbplog.INFO)
-

diff --git a/obs_service_gbp/adm.py b/obs_service_gbp/adm.py
index 2ee05b3ad900920eb065605be574ca1ddaae8809..31d96361e5a62f9e56a547af180c2b090618a8ad 100755 (executable)
--- a/obs_service_gbp/adm.py
+++ b/obs_service_gbp/adm.py
@@ -21,8 +21,9 @@
 
 import sys
 
+import obs_service_gbp
+import obs_service_gbp.command
 from repocache_adm.adm import MainCommand as BaseCommand
-from obs_service_gbp.command import read_config
 
 class MainCommand(BaseCommand):
     """Class for the command line script"""
@@ -30,10 +31,15 @@ class MainCommand(BaseCommand):
     def add_arguments(parser):
         """Add arguments"""
         # Parse config files
-        config = read_config()
+        config = obs_service_gbp.command.read_config()
         # Add arguments
         parser.set_defaults(cache_dir=config['repo-cache-dir'])
 
+    @classmethod
+    def main(cls, argv=None):
+        """Main entry point"""
+
+        super(MainCommand, cls).main(argv)
 
 if __name__ == '__main__':
     sys.exit(MainCommand.main())

diff --git a/obs_service_gbp/command.py b/obs_service_gbp/command.py
index d5ab1fe78323cfe8c673697d6ddc8cc1463dbf6f..ca75480540cbc2b7590834321c85523531171bce 100644 (file)
--- a/obs_service_gbp/command.py
+++ b/obs_service_gbp/command.py
@@ -20,20 +20,26 @@
 
 import os
 import argparse
+import logging
 import shutil
 import tempfile
 from ConfigParser import SafeConfigParser
 
+import gbp.log as gbplog
 from gbp.rpm import guess_spec, NoSpecError
 from gbp.scripts.buildpackage import main as gbp_deb
 from gbp.scripts.buildpackage_rpm import main as gbp_rpm
 
-from obs_service_gbp import LOGGER, gbplog
 from obs_service_gbp_utils import (GbpServiceError, GbpChildBTError, fork_call,
             sanitize_uid_gid, write_treeish_meta, str_to_bool)
 from gbp_repocache import CachedRepo, CachedRepoError
 import gbp_repocache
 
+
+# Setup logging
+LOGGER = logging.getLogger('source_service')
+LOGGER.setLevel(logging.INFO)
+
 def have_spec(directory):
     """Find if the package has spec files"""
     try:
@@ -192,11 +198,12 @@ def main(argv=None):
 
     args = parse_args(argv)
 
+    logging.basicConfig()
     LOGGER.info('Starting git-buildpackage source service')
     if args.verbose == 'yes':
-        gbplog.setup(color='auto', verbose=True)
-        LOGGER.setLevel(gbplog.DEBUG)
-        gbp_repocache.LOGGER.setLevel(gbplog.DEBUG)
+        #gbplog.setup(color='auto', verbose=True)
+        LOGGER.setLevel(logging.DEBUG)
+        gbp_repocache.LOGGER.setLevel(logging.DEBUG)
 
     config = read_config(args.config)