Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232264
Change subject: Do not leave stale locks on system exit or keyboard interrupt
......................................................................
Do not leave stale locks on system exit or keyboard interrupt
Also, small tweaks to logging and declare we're not zip safe
Change-Id: I7cbeb7f5e1887daa951b3e7551f291b7e160c47c
---
M conftool/__init__.py
M conftool/backend.py
M conftool/tests/integration/test_tool.py
M setup.py
4 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/conftool
refs/changes/64/232264/1
diff --git a/conftool/__init__.py b/conftool/__init__.py
index 34ec4cd..ea5df15 100644
--- a/conftool/__init__.py
+++ b/conftool/__init__.py
@@ -78,6 +78,9 @@
_log.critical("Problems inside lock for %s: %s", path, e)
cls.backend.driver.release_lock(path)
raise
+ except (SystemExit, KeyboardInterrupt) as e:
+ _log.critical("Aborted.")
+ cls.backend.driver.release_lock(path)
def _from_net(self, values):
"""
diff --git a/conftool/backend.py b/conftool/backend.py
index f3a0abd..fc1a1b3 100644
--- a/conftool/backend.py
+++ b/conftool/backend.py
@@ -17,5 +17,5 @@
self.driver = cls(config)
except Exception as e:
_log.critical("Could not load driver %s: %s",
- self.config.driver, e)
+ self.config.driver, e, exc_info=True)
sys.exit(3)
diff --git a/conftool/tests/integration/test_tool.py
b/conftool/tests/integration/test_tool.py
index ff69430..1831ae3 100644
--- a/conftool/tests/integration/test_tool.py
+++ b/conftool/tests/integration/test_tool.py
@@ -43,7 +43,7 @@
def test_change_node_regexp(self):
"""
- Test changing values according to a regexp
+ Changing values according to a regexp
"""
args = self.generate_args('set/pooled=yes re:cp105.')
tool.main(cmdline=args)
diff --git a/setup.py b/setup.py
index d114ee2..c336bfb 100755
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
install_requires=['python-etcd>=0.4.0', 'pyyaml'],
test_suite='nose.collector',
tests_require=['mock', 'nose'],
- zip_safe=True,
+ zip_safe=False,
packages=find_packages(),
entry_points={
'console_scripts': [
--
To view, visit https://gerrit.wikimedia.org/r/232264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cbeb7f5e1887daa951b3e7551f291b7e160c47c
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/conftool
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
