Extract configuration from manager and wrapper
This commit is contained in:
@@ -10,6 +10,12 @@ export interface WrapperConfig {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const RABBITMQ_URL = "amqp://manager:gigi1337@192.168.1.74";
|
||||||
|
export const WRAPPER_HEARTBEAT_INTERVAL = 10000;
|
||||||
|
export const WRAPPER_STATUS_INTERVAL = 10000;
|
||||||
|
export const WRAPPER_QUERY_INTERVAL = 5000;
|
||||||
|
export const SERVER_SCRIPT_PATH = "/home/heroes/HeroesOfValorServer.sh";
|
||||||
|
export const SERVER_WORKING_DIRECTORY = "/home/heroes";
|
||||||
|
|
||||||
|
|
||||||
export function loadConfig(): WrapperConfig {
|
export function loadConfig(): WrapperConfig {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import * as amqp from "amqplib";
|
import * as amqp from "amqplib";
|
||||||
import os from "os";
|
import os from "os";
|
||||||
import { loadConfig, saveConfig } from "./config";
|
import { loadConfig, saveConfig, RABBITMQ_URL, WRAPPER_HEARTBEAT_INTERVAL } from "./config";
|
||||||
import { ProcessManager } from "./processManager";
|
import { ProcessManager } from "./processManager";
|
||||||
import { StatusReporter } from "./statusReporter";
|
import { StatusReporter } from "./statusReporter";
|
||||||
import { QueryManager } from "./queryManager";
|
import { QueryManager } from "./queryManager";
|
||||||
@@ -67,7 +67,7 @@ class Wrapper {
|
|||||||
|
|
||||||
this.connection =
|
this.connection =
|
||||||
await amqp.connect(
|
await amqp.connect(
|
||||||
"amqp://manager:gigi1337@192.168.1.74"
|
RABBITMQ_URL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
@@ -444,7 +444,7 @@ class Wrapper {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
},10000);
|
},WRAPPER_HEARTBEAT_INTERVAL);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { spawn, ChildProcess } from "child_process";
|
import { spawn, ChildProcess } from "child_process";
|
||||||
import { ServerStartCommand } from "server-manager-shared";
|
import { ServerStartCommand } from "server-manager-shared";
|
||||||
|
import { SERVER_SCRIPT_PATH, SERVER_WORKING_DIRECTORY } from "./config";
|
||||||
|
|
||||||
|
|
||||||
interface ServerProcess {
|
interface ServerProcess {
|
||||||
@@ -68,10 +69,10 @@ export class ProcessManager {
|
|||||||
|
|
||||||
|
|
||||||
const process = spawn(
|
const process = spawn(
|
||||||
"/home/heroes/HeroesOfValorServer.sh",
|
SERVER_SCRIPT_PATH,
|
||||||
args,
|
args,
|
||||||
{
|
{
|
||||||
cwd:"/home/heroes",
|
cwd: SERVER_WORKING_DIRECTORY,
|
||||||
stdio:"pipe",
|
stdio:"pipe",
|
||||||
detached:true
|
detached:true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { queryGameServerInfo } from "steam-server-query";
|
import { queryGameServerInfo } from "steam-server-query";
|
||||||
import { ProcessManager } from "./processManager";
|
import { ProcessManager } from "./processManager";
|
||||||
|
import { WRAPPER_QUERY_INTERVAL } from "./config";
|
||||||
|
|
||||||
|
|
||||||
export class QueryManager {
|
export class QueryManager {
|
||||||
@@ -27,7 +28,7 @@ export class QueryManager {
|
|||||||
this.updateQueries();
|
this.updateQueries();
|
||||||
|
|
||||||
|
|
||||||
},5000);
|
},WRAPPER_QUERY_INTERVAL);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { ProcessManager } from "./processManager";
|
|||||||
import os from "os";
|
import os from "os";
|
||||||
import { QueryManager } from "./queryManager";
|
import { QueryManager } from "./queryManager";
|
||||||
import { WrapperStatusMessage } from "server-manager-shared";
|
import { WrapperStatusMessage } from "server-manager-shared";
|
||||||
|
import { WRAPPER_STATUS_INTERVAL } from "./config";
|
||||||
|
|
||||||
|
|
||||||
export class StatusReporter {
|
export class StatusReporter {
|
||||||
@@ -36,7 +36,7 @@ export class StatusReporter {
|
|||||||
this.sendStatus();
|
this.sendStatus();
|
||||||
|
|
||||||
|
|
||||||
},10000);
|
},WRAPPER_STATUS_INTERVAL);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user