Better APP_URL check

2 files changed, 10 insertions, 6 deletions

diff --git a/build/server.js b/build/server.js
index 8c618f1..dae3674 100644
--- a/build/server.js
+++ b/build/server.js
@@ -1282,12 +1282,15 @@ server_Main.prototype = {
 	,initIntergationHandlers: function() {
 		var _gthis = this;
 		if(process.env["_"] != null && process.env["_"].indexOf("heroku") != -1 && process.env["APP_URL"] != null) {
+			var url = process.env["APP_URL"];
+			if(!StringTools.startsWith(url,"http")) {
+				url = "http://" + url;
+			}
 			new haxe_Timer(600000).run = function() {
 				if(_gthis.clients.length == 0) {
 					return;
 				}
-				var url = "http://" + process.env["APP_URL"];
-				haxe_Log.trace("Ping " + url,{ fileName : "src/server/Main.hx", lineNumber : 214, className : "server.Main", methodName : "initIntergationHandlers"});
+				haxe_Log.trace("Ping " + url,{ fileName : "src/server/Main.hx", lineNumber : 215, className : "server.Main", methodName : "initIntergationHandlers"});
 				js_node_Http.get(url,function(r) {
 					return;
 				});
@@ -1302,14 +1305,14 @@ server_Main.prototype = {
 		}
 		this.userList.admins.push({ name : name, hash : hash});
 		this.writeUsers(this.userList);
-		haxe_Log.trace("Admin " + name + " added.",{ fileName : "src/server/Main.hx", lineNumber : 229, className : "server.Main", methodName : "addAdmin"});
+		haxe_Log.trace("Admin " + name + " added.",{ fileName : "src/server/Main.hx", lineNumber : 230, className : "server.Main", methodName : "addAdmin"});
 	}
 	,onConnect: function(ws,req) {
 		var _gthis = this;
 		var ip = req.connection.remoteAddress;
 		var id = this.freeIds.length > 0 ? this.freeIds.shift() : this.clients.length;
 		var name = "Guest " + (id + 1);
-		haxe_Log.trace("" + name + " connected (" + ip + ")",{ fileName : "src/server/Main.hx", lineNumber : 236, className : "server.Main", methodName : "onConnect"});
+		haxe_Log.trace("" + name + " connected (" + ip + ")",{ fileName : "src/server/Main.hx", lineNumber : 237, className : "server.Main", methodName : "onConnect"});
 		var client = new Client(ws,req,id,name,0);
 		client.setGroupFlag(ClientGroup.Admin,req.connection.localAddress == ip);
 		this.clients.push(client);
@@ -1333,7 +1336,7 @@ server_Main.prototype = {
 			return;
 		});
 		ws.on("close",function(err) {
-			haxe_Log.trace("Client " + client.name + " disconnected",{ fileName : "src/server/Main.hx", lineNumber : 266, className : "server.Main", methodName : "onConnect"});
+			haxe_Log.trace("Client " + client.name + " disconnected",{ fileName : "src/server/Main.hx", lineNumber : 267, className : "server.Main", methodName : "onConnect"});
 			server_Utils.sortedPush(_gthis.freeIds,client.id);
 			HxOverrides.remove(_gthis.clients,client);
 			_gthis.sendClientList();
diff --git a/src/server/Main.hx b/src/server/Main.hx
index e1789ff..b9c4d52 100644
--- a/src/server/Main.hx
+++ b/src/server/Main.hx
@@ -208,9 +208,10 @@ class Main {
 		// Prevent heroku idle when clients online (needs APP_URL env var)
 		if (process.env["_"] != null && process.env["_"].contains("heroku")
 			&& process.env["APP_URL"] != null) {
+			var url = process.env["APP_URL"];
+			if (!url.startsWith("http")) url = 'http://$url';
 			new Timer(10 * 60 * 1000).run = function() {
 				if (clients.length == 0) return;
-				final url = 'http://${process.env["APP_URL"]}';
 				trace('Ping $url');
 				Http.get(url, r -> {});
 			}