Show More
@@ -505,7 +505,6 b' class Application(SingletonConfigurable):' | |||||
505 |
|
505 | |||
506 | yield each config object in turn. |
|
506 | yield each config object in turn. | |
507 | """ |
|
507 | """ | |
508 |
|
||||
509 | pyloader = PyFileConfigLoader(basefilename+'.py', path=path, log=log) |
|
508 | pyloader = PyFileConfigLoader(basefilename+'.py', path=path, log=log) | |
510 | jsonloader = JSONFileConfigLoader(basefilename+'.json', path=path, log=log) |
|
509 | jsonloader = JSONFileConfigLoader(basefilename+'.json', path=path, log=log) | |
511 | config_found = False |
|
510 | config_found = False | |
@@ -519,7 +518,7 b' class Application(SingletonConfigurable):' | |||||
519 | except Exception: |
|
518 | except Exception: | |
520 | # try to get the full filename, but it will be empty in the |
|
519 | # try to get the full filename, but it will be empty in the | |
521 | # unlikely event that the error raised before filefind finished |
|
520 | # unlikely event that the error raised before filefind finished | |
522 | filename = loader.full_filename or filename |
|
521 | filename = loader.full_filename or basefilename | |
523 | # problem while running the file |
|
522 | # problem while running the file | |
524 | if log: |
|
523 | if log: | |
525 | log.error("Exception while loading config file %s", |
|
524 | log.error("Exception while loading config file %s", |
General Comments 0
You need to be logged in to leave comments.
Login now