3 files changed, 35 insertions, 26 deletions
diff --git a/src/server/index.ts b/src/server/index.ts
index d1bac6635..fd5552d12 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -149,9 +149,18 @@ export async function launchServer() {
  * log the output of the server process, so it's not ideal for development.
  * So, the 'else' clause is exactly what we've always run when executing npm start.
  */
+<<<<<<< HEAD
 if (process.env.RELEASE) {
     (sessionAgent = new DashSessionAgent()).launch();
 } else {
     setTimeout(() => (Database.Instance as Database.Database).doConnect(), 30000);
     launchServer();
 }
+=======
+// if (process.env.RELEASE) {
+//     (sessionAgent = new DashSessionAgent()).launch();
+// } else {
+(Database.Instance as Database.Database).doConnect();
+launchServer();
+// }
+>>>>>>> 9c3d461a9642a4596c55f642af2b55e186b0fe20
diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index 14b0dedc3..f572ec906 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -19,9 +19,11 @@ import * as fs from 'fs';
 import * as request from 'request';
 import RouteSubscriber from './RouteSubscriber';
 import { publicDirectory } from '.';
-import { logPort, } from './ActionUtilities';
+import { logPort, pathFromRoot, } from './ActionUtilities';
 import { blue, yellow } from 'colors';
 import * as cors from "cors";
+import { createServer, Server as SecureServer } from "https";
+import { Server } from "http";
 
 /* RouteSetter is a wrapper around the server that prevents the server
    from being exposed. */
@@ -48,30 +50,27 @@ export default async function InitializeServer(routeSetter: RouteSetter) {
     routeSetter(new RouteManager(app, isRelease));
     registerRelativePath(app);
 
-    const serverPort = isRelease ? Number(process.env.serverPort) : 1050;
-    const server = app.listen(serverPort, () => {
-        logPort("server", serverPort);
-        console.log();
-    });
+    const { serverPort } = process.env;
+    const resolved = isRelease && serverPort ? Number(serverPort) : 1050;
+
+    let server: Server | SecureServer;
+    if (isRelease) {
+        server = createServer({
+            key: fs.readFileSync(pathFromRoot(`./${process.env.serverName}.key`)),
+            cert: fs.readFileSync(pathFromRoot(`./${process.env.serverName}.crt`))
+        }, app);
+        (server as SecureServer).listen(resolved, () => {
+            logPort("server", resolved);
+            console.log();
+        });
+    } else {
+        server = app.listen(resolved, () => {
+            logPort("server", resolved);
+            console.log();
+        });
+    }
 
-    // var express = require('express')
-    // var fs = require('fs')
-    // var https = require('https')
-    // var app = express()
-
-    // app.get('/', function (req, res) {
-    //   res.send('hello world')
-    // })
-
-    // https.createServer({
-    //   key: fs.readFileSync('server.key'),
-    //   cert: fs.readFileSync('server.cert')
-    // }, app)
-    // .listen(3000, function () {
-    //   console.log('Example app listening on port 3000! Go to https://localhost:3000/')
-    // })
     disconnect = async () => new Promise<Error>(resolve => server.close(resolve));
-
     return isRelease;
 }
 
diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index 7278bdc32..9ab3d2611 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -122,9 +122,10 @@ export namespace WebSocket {
             };
         });
 
-        const socketPort = isRelease ? Number(process.env.socketPort) : 4321;
-        endpoint.listen(socketPort);
-        logPort("websocket", socketPort);
+        const { socketPort } = process.env;
+        const resolved = isRelease && socketPort ? Number(socketPort) : 4321;
+        endpoint.listen(resolved);
+        logPort("websocket", resolved);
     }
 
     function processGesturePoints(socket: Socket, content: GestureContent) {