[server] Move DebugApp to protocol

gitpod-io · Jun 14, 2022 · 60131ac · 60131ac
1 parent e3f9ca5
commit 60131ac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/components/gitpod-protocol/package.json b/components/gitpod-protocol/package.json
@@ -13,6 +13,7 @@
         "@types/analytics-node": "^3.1.5",
         "@types/chai-subset": "^1.3.3",
         "@types/cookie": "^0.4.1",
+        "@types/express": "^4.17.13",
         "@types/jaeger-client": "^3.18.3",
         "@types/js-yaml": "^3.10.1",
         "@types/mocha": "^5.2.7",
@@ -42,6 +43,7 @@
         "ajv": "^6.5.4",
         "analytics-node": "^4.0.1",
         "cookie": "^0.4.2",
+        "express": "^4.17.3",
         "inversify": "^5.1.1",
         "jaeger-client": "^3.18.1",
         "js-yaml": "^3.10.0",

diff --git a/components/server/src/debug-app.ts → ...nts/gitpod-protocol/src/util/debug-app.ts b/components/server/src/debug-app.ts → ...nts/gitpod-protocol/src/util/debug-app.ts
@@ -7,7 +7,7 @@
 import * as http from "http";
 import * as express from "express";
 import { injectable, postConstruct } from "inversify";
-import { log, LogrusLogLevel } from "@gitpod/gitpod-protocol/lib/util/logging";
+import { log, LogrusLogLevel } from "./logging";
 
 export interface SetLogLevelRequest {
     level: LogrusLogLevel;
@@ -53,7 +53,7 @@ export class DebugApp {
         return app;
     }
 
-    public start(port: number) {
+    public start(port: number = 6060) {
         this.httpServer = this._app.listen(port, "localhost", () => {
             log.info(`debug server listening on port: ${port}`);
         });

diff --git a/components/server/src/container-module.ts b/components/server/src/container-module.ts
@@ -92,7 +92,7 @@ import { defaultGRPCOptions } from "@gitpod/gitpod-protocol/lib/util/grpc";
 import { IDEConfigService } from "./ide-config";
 import { PrometheusClientCallMetrics } from "@gitpod/gitpod-protocol/lib/messaging/client-call-metrics";
 import { IClientCallMetrics } from "@gitpod/content-service/lib/client-call-metrics";
-import { DebugApp } from "./debug-app";
+import { DebugApp } from "@gitpod/gitpod-protocol/lib/util/debug-app";
 import { LocalMessageBroker, LocalRabbitMQBackedMessageBroker } from "./messaging/local-message-broker";
 import { contentServiceBinder } from "@gitpod/content-service/lib/sugar";
 import { ReferrerPrefixParser } from "./workspace/referrer-prefix-context-parser";

diff --git a/components/server/src/server.ts b/components/server/src/server.ts
@@ -44,7 +44,7 @@ import {
 } from "./workspace/headless-log-controller";
 import { NewsletterSubscriptionController } from "./user/newsletter-subscription-controller";
 import { Config } from "./config";
-import { DebugApp } from "./debug-app";
+import { DebugApp } from "@gitpod/gitpod-protocol/lib/util/debug-app";
 import { LocalMessageBroker } from "./messaging/local-message-broker";
 import { WsConnectionHandler } from "./express/ws-connection-handler";
 import { InstallationAdminController } from "./installation-admin/installation-admin-controller";
@@ -334,7 +334,7 @@ export class Server<C extends GitpodClient, S extends GitpodServer> {
             });
         }
 
-        this.debugApp.start(6060);
+        this.debugApp.start();
     }
 
     public async stop() {