diff --git a/.gitignore b/.gitignore
index 2d37d5c7..a3f660a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@
 # C extensions
 *.so
 
+# log extensions
+*.log
+
 # Packages
 *.egg
 *.egg-info
diff --git a/compass/actions/poll_switch.py b/compass/actions/poll_switch.py
index e4094544..639cd7d5 100644
--- a/compass/actions/poll_switch.py
+++ b/compass/actions/poll_switch.py
@@ -120,7 +120,7 @@ def poll_switch(
     """
     poller = user_api.get_user_object(poller_email)
     ip_int = long(netaddr.IPAddress(ip_addr))
-    with util.lock('poll switch %s' % ip_addr) as lock:
+    with util.lock('poll switch %s' % ip_addr, timeout=120) as lock:
         if not lock:
             raise Exception(
                 'failed to acquire lock to poll switch %s' % ip_addr