From 6fca28ec0b2bce43d56340fc5492e8efb7e8e180 Mon Sep 17 00:00:00 2001 From: Sam Wilkins Date: Tue, 20 Oct 2020 22:23:00 -0700 Subject: removed artificial error --- src/server/websocket.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/server/websocket.ts b/src/server/websocket.ts index 9103af156..6ceb9e29f 100644 --- a/src/server/websocket.ts +++ b/src/server/websocket.ts @@ -178,9 +178,6 @@ export namespace WebSocket { } function barReceived(socket: SocketIO.Socket, userEmail: string) { - setTimeout(() => { - throw new Error("Oh no! The server crashed..."); - }, 15000); clients[userEmail] = new Client(userEmail.toString()); const currentdate = new Date(); const datetime = currentdate.getDate() + "/" -- cgit v1.2.3-70-g09d2 From 0ec2b98844dc790998146afc4ab9d0d71aeb0ed1 Mon Sep 17 00:00:00 2001 From: Sam Wilkins Date: Wed, 21 Oct 2020 00:31:09 -0700 Subject: removed npm start release --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 72b4be750..605345017 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,12 @@ "child_process": "empty" }, "scripts": { - "start-release": "cross-env RELEASE=true NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --debug -- src/server/index.ts", "start": "cross-env NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --debug --transpile-only -- src/server/index.ts", "oldstart": "cross-env NODE_OPTIONS=--max_old_space_size=4096 ts-node-dev --debug -- src/server/index.ts", "debug": "cross-env NODE_OPTIONS=--max_old_space_size=8192 ts-node-dev --transpile-only --inspect -- src/server/index.ts", + "monitor": "cross-env MONITORED=true NODE_OPTIONS=--max_old_space_size=4096 ts-node src/server/index.ts", "build": "cross-env NODE_OPTIONS=--max_old_space_size=8192 webpack --env production", "test": "mocha -r ts-node/register test/**/*.ts", - "monitor": "cross-env MONITORED=true NODE_OPTIONS=--max_old_space_size=4096 ts-node src/server/index.ts", "tsc": "tsc" }, "devDependencies": { @@ -263,4 +262,4 @@ "xoauth2": "^1.2.0", "xregexp": "^4.3.0" } -} +} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From cb54708465e64e0499be2af50308358055d6e53e Mon Sep 17 00:00:00 2001 From: Sam Wilkins Date: Wed, 21 Oct 2020 00:52:32 -0700 Subject: SessionManager now expects .MONITORED rather than .RELEASE --- src/server/ApiManagers/SessionManager.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/ApiManagers/SessionManager.ts b/src/server/ApiManagers/SessionManager.ts index fa2f6002a..e37f8c6db 100644 --- a/src/server/ApiManagers/SessionManager.ts +++ b/src/server/ApiManagers/SessionManager.ts @@ -12,9 +12,9 @@ export default class SessionManager extends ApiManager { private authorizedAction = (handler: SecureHandler) => { return (core: AuthorizedCore) => { - const { req: { params }, res, isRelease } = core; - if (!isRelease) { - return res.send("This can be run only on the release server."); + const { req: { params }, res } = core; + if (!process.env.MONITORED) { + return res.send("This command only makes sense in the context of a monitored session."); } if (params.session_key !== process.env.session_key) { return _permission_denied(res, permissionError); -- cgit v1.2.3-70-g09d2