etch-devel

[etch-devel] SF.net SVN: etch:[114] trunk/server/app/controllers/files_controller.rb

[<jh...@us...>]

Revision: 114
          http://etch.svn.sourceforge.net/etch/?rev=114&view=rev
Author:   jheiss
Date:     2009-10-12 23:36:25 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
Add a newline when assembling error response message so that the error
and the backtrace don't blend together on the same line.

Modified Paths:
--------------
    trunk/server/app/controllers/files_controller.rb

Modified: trunk/server/app/controllers/files_controller.rb
===================================================================
--- trunk/server/app/controllers/files_controller.rb	2009-10-12 23:35:37 UTC (rev 113)
+++ trunk/server/app/controllers/files_controller.rb	2009-10-12 23:36:25 UTC (rev 114)
@@ -19,7 +19,7 @@
     rescue Exception => e
       logger.error e.message
       logger.info e.backtrace.join("\n") if params[:debug]
-      response = e.message
+      response = e.message + "\n"
       response << e.backtrace.join("\n") if params[:debug]
       render :text => response, :status => :internal_server_error
     end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[etch-devel] SF.net SVN: etch:[128] trunk/server/app/controllers/files_controller.rb

[<jh...@us...>]

Revision: 128
          http://etch.svn.sourceforge.net/etch/?rev=128&view=rev
Author:   jheiss
Date:     2009-10-29 20:40:41 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
Add support for requesting specific commands.

Modified Paths:
--------------
    trunk/server/app/controllers/files_controller.rb

Modified: trunk/server/app/controllers/files_controller.rb
===================================================================
--- trunk/server/app/controllers/files_controller.rb	2009-10-29 20:40:20 UTC (rev 127)
+++ trunk/server/app/controllers/files_controller.rb	2009-10-29 20:40:41 UTC (rev 128)
@@ -13,8 +13,15 @@
       # The client runs the filename through CGI.escape in case it contains
       # special characters.  Older versions of Rails automatically decoded the
       # filename, but as of Rails 2.3 we need to do it ourself.
-      files = params[:files].inject({}) { |h, (file, value)| h[CGI.unescape(file)] = value; h }
-      response = etchserver.generate(files)
+      files = {}
+      if params[:files]
+        files = params[:files].inject({}) { |h, (file, value)| h[CGI.unescape(file)] = value; h }
+      end
+      commands = {}
+      if params[:commands]
+        commands = params[:commands].inject({}) { |h, (command, value)| h[CGI.unescape(command)] = value; h }
+      end
+      response = etchserver.generate(files, commands)
       render :text => response
     rescue Exception => e
       logger.error e.message


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.