aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Wilkins <samwilkins333@gmail.com>2020-10-15 11:54:46 -0700
committerSam Wilkins <samwilkins333@gmail.com>2020-10-15 11:54:46 -0700
commitb19972afc64bb9029b78c633e1841988af76adab (patch)
tree310d1352b309b0f1bc47578a8507b9b54a82376b /src
parent377d5c987728c2678ab38565328f1f7ad9f3d135 (diff)
With a MONITORED=true in .env, this should now work
Diffstat (limited to 'src')
-rw-r--r--src/server/DashSession/Session/agents/monitor.ts6
-rw-r--r--src/server/DashSession/Session/utilities/session_config.ts2
-rw-r--r--src/server/index.ts11
3 files changed, 10 insertions, 9 deletions
diff --git a/src/server/DashSession/Session/agents/monitor.ts b/src/server/DashSession/Session/agents/monitor.ts
index ee8afee65..044a841ae 100644
--- a/src/server/DashSession/Session/agents/monitor.ts
+++ b/src/server/DashSession/Session/agents/monitor.ts
@@ -22,7 +22,7 @@ export class Monitor extends IPCMessageReceiver {
private readonly config: Configuration;
private activeWorker: Worker | undefined;
private key: string | undefined;
- // private repl: Repl;
+ private repl: Repl;
public static Create() {
if (isWorker) {
@@ -46,7 +46,7 @@ export class Monitor extends IPCMessageReceiver {
this.configureInternalHandlers();
this.config = this.loadAndValidateConfiguration();
this.initializeClusterFunctions();
- // this.repl = this.initializeRepl();
+ this.repl = this.initializeRepl();
}
protected configureInternalHandlers = () => {
@@ -119,7 +119,7 @@ export class Monitor extends IPCMessageReceiver {
* that can invoke application logic external to this module
*/
public addReplCommand = (basename: string, argPatterns: (RegExp | string)[], action: ReplAction) => {
- // this.repl.registerCommand(basename, argPatterns, action);
+ this.repl.registerCommand(basename, argPatterns, action);
}
public exec = (command: string, options?: ExecOptions) => {
diff --git a/src/server/DashSession/Session/utilities/session_config.ts b/src/server/DashSession/Session/utilities/session_config.ts
index b0e65dde4..bde98e9d2 100644
--- a/src/server/DashSession/Session/utilities/session_config.ts
+++ b/src/server/DashSession/Session/utilities/session_config.ts
@@ -19,7 +19,7 @@ const identifierProperties: Schema = {
const portProperties: Schema = {
type: "number",
- minimum: 1024,
+ minimum: 443,
maximum: 65535
};
diff --git a/src/server/index.ts b/src/server/index.ts
index c4e6be8a2..9687c3b23 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -23,6 +23,7 @@ import { Logger } from "./ProcessFactory";
import RouteManager, { Method, PublicHandler } from './RouteManager';
import RouteSubscriber from './RouteSubscriber';
import initializeServer, { resolvedPorts } from './server_Initialization';
+import { DashSessionAgent } from "./DashSession/DashSessionAgent";
export const AdminPriviliges: Map<string, boolean> = new Map();
export const onWindows = process.platform === "win32";
@@ -186,9 +187,9 @@ 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.
*/
-// if (process.env.RELEASE) {
-// (sessionAgent = new DashSessionAgent()).launch();
-// } else {
(Database.Instance as Database.Database).doConnect();
-launchServer();
-// }
+if (process.env.MONITORED) {
+ (sessionAgent = new DashSessionAgent()).launch();
+} else {
+ launchServer();
+}