diff options
Diffstat (limited to 'lib/toaster')
| -rw-r--r-- | lib/toaster/bldcontrol/localhostbecontroller.py | 2 | ||||
| -rw-r--r-- | lib/toaster/bldcontrol/management/commands/runbuilds.py | 6 | ||||
| -rw-r--r-- | lib/toaster/bldcontrol/models.py | 10 | ||||
| -rw-r--r-- | lib/toaster/contrib/tts/shellutils.py | 2 | ||||
| -rw-r--r-- | lib/toaster/contrib/tts/urlcheck.py | 4 | ||||
| -rw-r--r-- | lib/toaster/toastermain/urls.py | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py index 7def1f3a1..7b2f126e9 100644 --- a/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/lib/toaster/bldcontrol/localhostbecontroller.py @@ -66,7 +66,7 @@ class LocalhostBEController(BuildEnvironmentController): err = "command: %s \n%s" % (command, out) else: err = "command: %s \n%s" % (command, err) - logger.warn("localhostbecontroller: shellcmd error %s" % err) + logger.warning("localhostbecontroller: shellcmd error %s" % err) raise ShellCmdException(err) else: logger.debug("localhostbecontroller: shellcmd success") diff --git a/lib/toaster/bldcontrol/management/commands/runbuilds.py b/lib/toaster/bldcontrol/management/commands/runbuilds.py index 27289be5f..5532b9deb 100644 --- a/lib/toaster/bldcontrol/management/commands/runbuilds.py +++ b/lib/toaster/bldcontrol/management/commands/runbuilds.py @@ -164,16 +164,16 @@ class Command(NoArgsCommand): try: self.cleanup() except Exception as e: - logger.warn("runbuilds: cleanup exception %s" % str(e)) + logger.warning("runbuilds: cleanup exception %s" % str(e)) try: self.archive() except Exception as e: - logger.warn("runbuilds: archive exception %s" % str(e)) + logger.warning("runbuilds: archive exception %s" % str(e)) try: self.schedule() except Exception as e: - logger.warn("runbuilds: schedule exception %s" % str(e)) + logger.warning("runbuilds: schedule exception %s" % str(e)) time.sleep(1) diff --git a/lib/toaster/bldcontrol/models.py b/lib/toaster/bldcontrol/models.py index cb49a58c4..e09ad20dc 100644 --- a/lib/toaster/bldcontrol/models.py +++ b/lib/toaster/bldcontrol/models.py @@ -98,11 +98,11 @@ class BuildRequest(models.Model): # Check that the state we're trying to set is not going backwards # e.g. from REQ_FAILED to REQ_INPROGRESS if self.old_state != self.state and self.old_state > self.state: - logger.warn("Invalid state change requested: " - "Cannot go from %s to %s - ignoring request" % - (BuildRequest.REQUEST_STATE[self.old_state][1], - BuildRequest.REQUEST_STATE[self.state][1]) - ) + logger.warning("Invalid state change requested: " + "Cannot go from %s to %s - ignoring request" % + (BuildRequest.REQUEST_STATE[self.old_state][1], + BuildRequest.REQUEST_STATE[self.state][1]) + ) # Set property back to the old value self.state = self.old_state return diff --git a/lib/toaster/contrib/tts/shellutils.py b/lib/toaster/contrib/tts/shellutils.py index c2012edf8..ce64c0634 100644 --- a/lib/toaster/contrib/tts/shellutils.py +++ b/lib/toaster/contrib/tts/shellutils.py @@ -133,7 +133,7 @@ def run_shell_cmd(command, cwd=None): err = "command: %s \n%s" % (command, out) else: err = "command: %s \n%s" % (command, err) - config.logger.warn("_shellcmd: error \n%s\n%s", out, err) + config.logger.warning("_shellcmd: error \n%s\n%s", out, err) raise ShellCmdException(err) else: #config.logger.debug("localhostbecontroller: shellcmd success\n%s" % out) diff --git a/lib/toaster/contrib/tts/urlcheck.py b/lib/toaster/contrib/tts/urlcheck.py index 0820f82e2..001fcee96 100644 --- a/lib/toaster/contrib/tts/urlcheck.py +++ b/lib/toaster/contrib/tts/urlcheck.py @@ -26,12 +26,12 @@ def validate_html5(url): warnings = int(resp['x-w3c-validator-warnings']) if status == 'Invalid': - config.logger.warn("Failed %s is %s\terrors %s warnings %s (check at %s)", url, status, errors, warnings, urlrequest) + config.logger.warning("Failed %s is %s\terrors %s warnings %s (check at %s)", url, status, errors, warnings, urlrequest) else: config.logger.debug("OK! %s", url) except Exception as exc: - config.logger.warn("Failed validation call: %s", exc) + config.logger.warning("Failed validation call: %s", exc) return (status, errors, warnings) diff --git a/lib/toaster/toastermain/urls.py b/lib/toaster/toastermain/urls.py index 534679dc5..530a42ffa 100644 --- a/lib/toaster/toastermain/urls.py +++ b/lib/toaster/toastermain/urls.py @@ -84,7 +84,7 @@ for t in os.walk(os.path.dirname(currentdir)): if not conflict: urlpatterns.insert(0, url(r'^' + modulename + '/', include ( modulename + '.urls'))) else: - logger.warn("Module \'%s\' has a regexp conflict, was not added to the urlpatterns" % modulename) + logger.warning("Module \'%s\' has a regexp conflict, was not added to the urlpatterns" % modulename) from pprint import pformat #logger.debug("urlpatterns list %s", pformat(urlpatterns)) |