gerrit-hooks -> gerrithooks

diff --git a/gerrit-hooks-log.conf b/gerrit-hooks-log.conf
deleted file mode 100644 (file)
index e4e4a11..0000000
--- a/gerrit-hooks-log.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-[loggers]
-keys=root,gerrit-hooks
-
-[handlers]
-keys=SysLogHandler,consoleHandler
-
-[formatters]
-keys=simpleFormatter
-
-[logger_root]
-level=DEBUG
-handlers=consoleHandler
-
-[logger_gerrit-hooks]
-level=DEBUG
-handlers=SysLogHandler
-qualname=gerrit-hooks
-propagate=0
-
-[handler_consoleHandler]
-class=StreamHandler
-level=DEBUG
-formatter=simpleFormatter
-args=(sys.stdout,)
-
-[handler_SysLogHandler]
-class=logging.handlers.SysLogHandler
-level=DEBUG
-formatter=simpleFormatter
-args=("%(syslog_socket)s",)
-
-[formatter_simpleFormatter]
-format=%(name)s - %(levelname)s - %(message)s

diff --git a/gerrit-hooks.conf b/gerrit-hooks.conf
deleted file mode 100644 (file)
index 1de8cfd..0000000
--- a/gerrit-hooks.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-[gerrit]
-url = https://review.example.org/gerrit
-
-[patchset_created_roles]
-enabled=True
-type=project_group
-match=.+- (Maintainers|Integrators|Reviewers)
-
-[patchest_created_packaging]
-enabled=False
-type=change_file
-match=^packaging/.+
-reviewer_group=Release Engineers
-reviewer=user1, user2
-
-[patchset_created_owner]
-enabled=False
-type=author
-match=someone@domain.com
-reviewer_group=SDK - Architects
-reviewer=user3, user4

diff --git a/gerrithooks-log.conf b/gerrithooks-log.conf
new file mode 100644 (file)
index 0000000..8e8606d
--- /dev/null
+++ b/gerrithooks-log.conf
@@ -0,0 +1,33 @@
+[loggers]
+keys=root,gerrithooks
+
+[handlers]
+keys=SysLogHandler,consoleHandler
+
+[formatters]
+keys=simpleFormatter
+
+[logger_root]
+level=DEBUG
+handlers=consoleHandler
+
+[logger_gerrithooks]
+level=DEBUG
+handlers=SysLogHandler
+qualname=gerrithooks
+propagate=0
+
+[handler_consoleHandler]
+class=StreamHandler
+level=DEBUG
+formatter=simpleFormatter
+args=(sys.stdout,)
+
+[handler_SysLogHandler]
+class=logging.handlers.SysLogHandler
+level=DEBUG
+formatter=simpleFormatter
+args=("%(syslog_socket)s",)
+
+[formatter_simpleFormatter]
+format=%(name)s - %(levelname)s - %(message)s

diff --git a/gerrithooks.conf b/gerrithooks.conf
new file mode 100644 (file)
index 0000000..1de8cfd
--- /dev/null
+++ b/gerrithooks.conf
@@ -0,0 +1,21 @@
+[gerrit]
+url = https://review.example.org/gerrit
+
+[patchset_created_roles]
+enabled=True
+type=project_group
+match=.+- (Maintainers|Integrators|Reviewers)
+
+[patchest_created_packaging]
+enabled=False
+type=change_file
+match=^packaging/.+
+reviewer_group=Release Engineers
+reviewer=user1, user2
+
+[patchset_created_owner]
+enabled=False
+type=author
+match=someone@domain.com
+reviewer_group=SDK - Architects
+reviewer=user3, user4

diff --git a/gerrithooks/common.py b/gerrithooks/common.py
index ef57edfcd12aed71bf5548c440601f6949571f75..344859c853f6457f3db4cd8b7d3fc7c5b2ddca05 100644 (file)
--- a/gerrithooks/common.py
+++ b/gerrithooks/common.py
@@ -53,8 +53,8 @@ def run_plugin_hooks(hook, parser):
         daemonize()
 
     logger.debug("looking for config")
-    confname = "gerrit-hooks.conf"
-    conf = find_config(confname, subdir="gerrit-hooks")
+    confname = "gerrithooks.conf"
+    conf = find_config(confname, subdir="gerrithooks")
     if not conf:
         logger.error("Log configuration file %s not found or not readable",
                         confname)

diff --git a/gerrithooks/misc.py b/gerrithooks/misc.py
index b74d313d03d9241aa4f57cbb819b3a8d51e91fbf..6528912e71ba887af9b9e9d33d0b572170112e5e 100644 (file)
--- a/gerrithooks/misc.py
+++ b/gerrithooks/misc.py
@@ -149,8 +149,8 @@ def configure_logging(appname):
     """Setup logging"""
     homedir = pwd.getpwuid(os.getuid()).pw_dir
 
-    log_confname = "gerrit-hooks-log.conf"
-    log_config = find_config(log_confname, subdir="gerrit-hooks")
+    log_confname = "gerrithooks-log.conf"
+    log_config = find_config(log_confname, subdir="gerrithooks")
     if not log_config:
         raise SystemExit("Log configuration file %s not found or not readable" \
                 % log_confname)

diff --git a/setup.py b/setup.py
index 736fe8b30315e608acb5c40716b9d99a0687bd20..533c0fcae9cc30b99a6c671825a8f20eb5f623e5 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 setup (
-    name = "gerrit-hooks",
+    name = "gerrithooks",
     version = "0.1.0",
     packages = find_packages(),
     license = "GPLv2",
@@ -21,8 +21,8 @@ setup (
     include_package_data = True,
     zip_safe = [True, False][bool(os.getenv('VIRTUAL_ENV'))],
     data_files = [
-        (['/etc/gerrit-hooks', 'gerrithooks'][bool(os.getenv('VIRTUAL_ENV'))],
-                ["gerrit-hooks.conf", "gerrit-hooks-log.conf"])
+        (['/etc/gerrithooks', 'gerrithooks'][bool(os.getenv('VIRTUAL_ENV'))],
+                ["gerrithooks.conf", "gerrithooks-log.conf"])
         ],
     author = "Alexander Kanevskiy",
     author_email = "alexander.kanevskiy@intel.com",