nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-02 00:32:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't try to discover down devices

Browse Source
This commit is contained in:
Clint Armstrong
2015-08-25 11:35:21 -04:00
parent 21e9dac646
commit 9931d9dc44
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
poller-service.py
+3 -3
View File
@@ -183,7 +183,7 @@ poller_group = ('and poller_group IN({}) '
# Add last_polled and last_polled_timetaken so we can sort by the time the last poll started, with the goal # Add last_polled and last_polled_timetaken so we can sort by the time the last poll started, with the goal
# of having each device complete a poll within the given time range. # of having each device complete a poll within the given time range.
dev_query = ('SELECT device_id, ' dev_query = ('SELECT device_id, status, '
'DATE_ADD( ' 'DATE_ADD( '
' DATE_SUB( ' ' DATE_SUB( '
' last_polled, ' ' last_polled, '
@@ -251,7 +251,7 @@ while True:
sys.exit(2) sys.exit(2)
devices = cursor.fetchall() devices = cursor.fetchall()
for device_id, next_poll, next_discovery in devices: for device_id, status, next_poll, next_discovery in devices:
# add queue lock, so we lock the next device against any other pollers # add queue lock, so we lock the next device against any other pollers
# if this fails, the device is locked by another poller already # if this fails, the device is locked by another poller already
if not getLock('queued.{}'.format(device_id)): if not getLock('queued.{}'.format(device_id)):
@@ -267,7 +267,7 @@ while True:
sleep_until(next_poll) sleep_until(next_poll)
action = 'poll' action = 'poll'
if not next_discovery or next_discovery < datetime.now(): if (not next_discovery or next_discovery < datetime.now()) and status == 1:
action = 'discovery' action = 'discovery'
log.debug('DEBUG: Starting {} of device {}'.format(action, device_id)) log.debug('DEBUG: Starting {} of device {}'.format(action, device_id))