Merge ~toabctl/jenkins-launchpad-plugin:master-launchpadTrigger-lock-timeout into jenkins-launchpad-plugin:master

[Thomas Bechtold]

SocketLock improvements

[Paride Legovini (paride)]

LGTM, thanks!

review: Approve

diff --git a/jlp/commands/launchpadTrigger.py b/jlp/commands/launchpadTrigger.py
index 8f0bbb6..0d4649b 100644
--- a/jlp/commands/launchpadTrigger.py
+++ b/jlp/commands/launchpadTrigger.py
@@ -76,6 +76,9 @@ def launchpadTrigger():
                         default='launchpadTrigger',
                         help='''Name of the lock and launchpadlib cache
                         to be used''')
+    parser.add_argument('--lock-timeout',
+                        default=None,
+                        help='''timeout in seconds (or None)''')
     parser.add_argument("-r", "--repo_type", default="auto",
                         help="Repository type [bazaar, git, or auto]")
 
@@ -93,6 +96,6 @@ def launchpadTrigger():
         instance_name=args['lock_name'])
     logger.debug('Going to acquire launchpad lock "{}"'
                  ' for launchpadTrigger'.format(trigger_lock_name))
-    with SocketLock(trigger_lock_name):
+    with SocketLock(trigger_lock_name, args['lock_timeout']):
         logger.debug('Lock acquired for launchpadTrigger')
         return trigger_jenkins(**args)
diff --git a/jlp/socketlock.py b/jlp/socketlock.py
index da7471c..97741cf 100644
--- a/jlp/socketlock.py
+++ b/jlp/socketlock.py
@@ -1,3 +1,4 @@
+from jlp import logger
 import socket
 from lockfile import LockTimeout, AlreadyLocked
 import time
@@ -44,6 +45,7 @@ class SocketLock(object):
                 self.socket.bind('\0' + self.lockname)
                 return
             except socket.error:
+                logger.exception('Can not acquire SocketLock')
                 if timeout is not None and time.time() > end_time:
                     if timeout > 0:
                         raise LockTimeout