lib/doraemon/proxy_server.rb in doraemon-1.0.1 vs lib/doraemon/proxy_server.rb in doraemon-1.0.2

@@ -13,33 +13,29 @@
 
     def start(api_list)
       
       Cert.generate_cert
 
-      session = Ritm::Session.new
+      _session = Ritm::Session.new
 
-      port = @port
+      _port = @port
       
-      session.configure do
+      _session.configure do
         ssl_reverse_proxy.ca[:pem] = Cert.cert_path
         ssl_reverse_proxy.ca[:key] = Cert.key_path
         proxy[:bind_address] = '0.0.0.0'
-        proxy[:bind_port] = port
+        proxy[:bind_port] = _port
       end
       
-      session.on_response do |_req, _resp|
+      _session.on_response do |_req, _resp|
 
         if api_list.include?(_req.path)
 
-          _params = nil
-          begin
-            _params = JSON.parse(_req.body)
-          rescue
-            _params = _req.body
-          end
+          puts "- - - > #{_req.path}"
 
-          _result = JSON.parse(_resp.body)
+          _params = begin JSON.parse(_req.body) rescue _req.body end
+          _result = begin JSON.parse(_resp.body) rescue {} end
 
           begin
             _result = eval(File.read(File.join(@root, api_list[_req.path])))
           rescue
             _result = {
@@ -51,19 +47,18 @@
           _resp.status = 200
           _resp.body = _result.to_json
           _resp.header['content-length'] = _resp.body.bytesize
           _resp.header['content-type'] = 'application/json;charset=UTF-8'
           
-          puts "- - - > #{_req.path}"
           puts "#{JSON.pretty_generate(_result)}\n\n"
         end
         
       end
       
-      session.start
+      _session.start
       
       # trap 'INT' do
-      #   session.shutdown
+      #   _session.shutdown
       #   return
       # end
       # loop { gets }
 
     end
\ No newline at end of file