NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-20 12:22:23 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Tweaked logging; renamed release config parameters

Browse Source
This commit is contained in:
Jeremy Stretch
2020-03-18 13:46:47 -04:00
parent 022653f446
commit fe4f4bddc8
6 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/utilities/background_tasks.py
View File

@@ -12,7 +12,7 @@ logger = logging.getLogger('netbox.releases')
@job('check_releases')
def get_releases(pre_releases=False):
url = settings.UPDATE_REPO_URL
url = settings.RELEASE_CHECK_URL
headers = {
'Accept': 'application/vnd.github.v3+json',
}
@@ -21,7 +21,7 @@ def get_releases(pre_releases=False):
# Check whether this URL has failed recently and shouldn't be retried yet
try:
if url == cache.get('latest_release_no_retry'):
logger.debug("Skipping release check; URL failed recently: {}".format(url))
logger.info("Skipping release check; URL failed recently: {}".format(url))
return []
except CacheMiss:
pass
@@ -47,6 +47,6 @@ def get_releases(pre_releases=False):
return []
# Cache the most recent release
cache.set('latest_release', max(releases), settings.UPDATE_CACHE_TIMEOUT)
cache.set('latest_release', max(releases), settings.RELEASE_CHECK_TIMEOUT)
return releases

8
netbox/utilities/releases.py
View File

@@ -10,7 +10,7 @@ logger = logging.getLogger('netbox.releases')
def get_latest_release(pre_releases=False):
if settings.UPDATE_REPO_URL:
if settings.RELEASE_CHECK_URL:
logger.debug("Checking for most recent release")
try:
latest_release = cache.get('latest_release')
@@ -21,13 +21,13 @@ def get_latest_release(pre_releases=False):
# Check for an existing job. This can happen if the RQ worker process is not running.
queue = get_queue('check_releases')
if queue.jobs:
logger.debug("Job to check for new releases is already queued; skipping")
logger.warning("Job to check for new releases is already queued; skipping")
else:
# Get the releases in the background worker, it will fill the cache
logger.debug("Initiating background task to retrieve updated releases list")
logger.info("Initiating background task to retrieve updated releases list")
get_releases.delay(pre_releases=pre_releases)
else:
logger.debug("Skipping release check; UPDATE_REPO_URL not defined")
logger.debug("Skipping release check; RELEASE_CHECK_URL not defined")
return 'unknown', None