diff --git a/.hgignore b/.hgignore index 52bb7f2..062eb36 100644 --- a/.hgignore +++ b/.hgignore @@ -3,6 +3,7 @@ syntax: glob *.swp *~ luminotes.log +luminotes_error.log luminotes.db session/* files/* diff --git a/config/Desktop.py b/config/Desktop.py index d7f83ca..abd32df 100644 --- a/config/Desktop.py +++ b/config/Desktop.py @@ -9,7 +9,7 @@ settings = { "session_filter.timeout": 60 * 24 * 365, # one year "static_filter.root": os.getcwd(), "server.log_to_screen": False, - "server.log_file": "luminotes.log", + "server.log_file": "luminotes_error.log", "server.log_access_file": "luminotes.log", "server.log_tracebacks": True, "luminotes.launch_browser": True, diff --git a/config/Production.py b/config/Production.py index 009dda0..711ae56 100644 --- a/config/Production.py +++ b/config/Production.py @@ -8,7 +8,7 @@ settings = { "base_url_filter.on": True, "base_url_filter.use_x_forwarded_host": True, "server.log_to_screen": False, - "server.log_file": "luminotes.log", + "server.log_file": "luminotes_error.log", "server.log_access_file": "luminotes.log", "server.log_tracebacks": True, }, diff --git a/controller/Root.py b/controller/Root.py index d2eee47..189a798 100644 --- a/controller/Root.py +++ b/controller/Root.py @@ -391,7 +391,7 @@ class Root( object ): import traceback if not self.__suppress_exceptions: - traceback.print_exc() + cherrypy.log( traceback.format_exc() ) self.report_traceback() import sys diff --git a/luminotes.py b/luminotes.py index 6125c8a..d52ca97 100755 --- a/luminotes.py +++ b/luminotes.py @@ -75,11 +75,15 @@ def main( args ): sys.exit( 0 ) - # remove the existing log file, if any + # remove the existing log files, if any try: os.remove( "luminotes.log" ) except OSError: pass + try: + os.remove( "luminotes_error.log" ) + except OSError: + pass socket.setdefaulttimeout( SOCKET_TIMEOUT_SECONDS ) diff --git a/setup.py b/setup.py index 65622b3..8e9cc0d 100644 --- a/setup.py +++ b/setup.py @@ -110,6 +110,7 @@ class InnoScript: print >> ofi, r"[UninstallDelete]" print >> ofi, r'Type: files; Name: "{app}\luminotes.log"' + print >> ofi, r'Type: files; Name: "{app}\luminotes_error.log"' print >> ofi print >> ofi, r"[UninstallRun]"