diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-10-21 13:33:55 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-10-21 13:33:55 +0530 |
| commit | e0871e894b1a2106647d04904b6efbbf2f2f3fe2 (patch) | |
| tree | 764ab2e35fe0a69bff4446c0d1d9745a9802183e | |
| parent | 5568b31f7a8e83624402838c9f7f71f56defac98 (diff) | |
| parent | cb54708465e64e0499be2af50308358055d6e53e (diff) | |
Merge branch 'restored_server_monitor' of https://github.com/browngraphicslab/Dash-Web into restored_server_monitor
| -rw-r--r-- | package.json | 5 | ||||
| -rw-r--r-- | src/server/ApiManagers/SessionManager.ts | 6 |
2 files changed, 5 insertions, 6 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 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); |