final cleanups after webservice setup rejig

siddharthvp · Jun 28, 2024 · 1d6c9e7 · 1d6c9e7
1 parent 490312b
commit 1d6c9e7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/restart-services.yml b/.github/workflows/restart-services.yml
@@ -12,7 +12,7 @@ jobs:
         with:
           command: >-
             become sdzerobot bash -c '
-              cd /data/project/sdzerobot/www/js && npm restart;
+              cd /data/project/sdzerobot/SDZeroBot/webservice && npm restart;
               cd /data/project/sdzerobot/SDZeroBot/eventstream-router && npm restart;
             '
           host: login.toolforge.org

diff --git a/most-gans/web-endpoint.ts b/most-gans/web-endpoint.ts
@@ -2,7 +2,7 @@ import * as express from "express";
 import 'express-async-errors';
 import {toolsdb} from '../db';
 import {AuthManager, bot} from "../botbase";
-import {TABLE} from '../../SDZeroBot/most-gans/model';
+import {TABLE} from './model';
 
 const router = express.Router();
 

diff --git a/webservice/routes/articlesearch.ts b/webservice/routes/articlesearch.ts
@@ -1,7 +1,7 @@
 import * as express from "express";
 import 'express-async-errors';
 import {JSDOM} from 'jsdom';
-import {bot, TextExtractor} from '../../../SDZeroBot/botbase';
+import {bot, TextExtractor} from '../../botbase';
 import {numericArg} from "../utils";
 
 const router = express.Router();

diff --git a/webservice/routes/logs.ts b/webservice/routes/logs.ts
@@ -1,6 +1,6 @@
 import * as express from "express";
 import {exec} from "child_process";
-import {mapPath} from "../../../SDZeroBot/utils";
+import {mapPath} from "../../utils";
 import {numericArg} from "../utils";
 
 const router = express.Router();

diff --git a/webservice/routes/summary.ts b/webservice/routes/summary.ts
@@ -1,6 +1,6 @@
 import * as express from "express";
 import 'express-async-errors';
-import {bot, TextExtractor} from '../../../SDZeroBot/botbase';
+import {bot, TextExtractor} from '../../botbase';
 
 const router = express.Router();
 

diff --git a/webservice/tunnels.ts b/webservice/tunnels.ts
@@ -1,6 +1,6 @@
-import {closeTunnels, createLocalSSHTunnel} from "../../SDZeroBot/utils";
-import {ENWIKI_DB_HOST, TOOLS_DB_HOST} from "../../SDZeroBot/db";
-import {REDIS_HOST} from "../../SDZeroBot/redis";
+import {closeTunnels, createLocalSSHTunnel} from "../utils";
+import {ENWIKI_DB_HOST, TOOLS_DB_HOST} from "../db";
+import {REDIS_HOST} from "../redis";
 
 createLocalSSHTunnel(ENWIKI_DB_HOST);
 createLocalSSHTunnel(TOOLS_DB_HOST);