fix get/set url generation/parsing

[peach-cgt.git] / server.coffee

diff --git a/server.coffee b/server.coffee
index 0411657..8e35241 100644 (file)
--- a/server.coffee
+++ b/server.coffee
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-listen_port = process.env.app_port ? 9988
+listen_port = process.env.PORT ? process.env.app_port ? 9988
 sys = require 'sys'
 fs = require 'fs'
 http = require 'http'
@@ -282,7 +282,7 @@ http_server = http.createServer (req, res) ->
        else if rel_path.substr(rel_path.length - 3) is '.js'
                res.writeHead 200, 'Content-Type': 'text/javascript'
                return js_handler url_parts.query, res, req, url_parts
-       else if rel_path.substr(rel_path.length - 4) is '/set'
+       else if rel_path is 'set'
                data = ''
                req.on 'data', (chunk) ->
                        data += chunk
@@ -293,7 +293,7 @@ http_server = http.createServer (req, res) ->
                                query[key] = parg
                        return set_handler query, res, req, url_parts
                return
-       else if rel_path.substr(rel_path.length - 4) is '/get'
+       else if rel_path is 'get'
                return get_handler url_parts.query, res, req, url_parts
        else if rel_path.substr(rel_path.length - 4) is '.ico'
                res.writeHead 404
@@ -302,11 +302,10 @@ http_server = http.createServer (req, res) ->
        return html_handler url_parts.query, res, req, url_parts
 
 ################## INIT ####################
-# nodester starts this app with the current working directory set to / and working copy in /app
-if process.cwd() is '/'
-       process.chdir '/app'
+# make sure the current working directory is correct
+process.chdir __dirname
 
 setInterval expire_old_games, 2 * 60 * 1000 # check every 2 minutes for expired games
 
-http_server.listen listen_port, "127.0.0.1"
+http_server.listen listen_port
 console.log "Server running at http://127.0.0.1:#{listen_port}/"