formatting

aws · Dec 20, 2024 · 2b50174 · 2b50174
1 parent e7d4a1a
commit 2b50174
Show file tree

Hide file tree

Showing 9 changed files with 205 additions and 215 deletions.
diff --git a/common/lib/host_list_provider/rds_host_list_provider.ts b/common/lib/host_list_provider/rds_host_list_provider.ts
@@ -143,8 +143,7 @@ export class RdsHostListProvider implements DynamicHostListProvider {
     }
 
     if (client) {
-      const val = await dialect.getHostRole(client);
-      return val;
+      return await dialect.getHostRole(client);
     } else {
       throw new AwsWrapperError(Messages.get("AwsClient targetClient not defined."));
     }

diff --git a/common/lib/plugins/connection_tracker/aurora_connection_tracker_plugin.ts b/common/lib/plugins/connection_tracker/aurora_connection_tracker_plugin.ts
@@ -57,7 +57,6 @@ export class AuroraConnectionTrackerPlugin extends AbstractConnectionPlugin impl
     isInitialConnection: boolean,
     connectFunc: () => Promise<ClientWrapper>
   ): Promise<ClientWrapper> {
-
     return this.connectInternal(hostInfo, connectFunc);
   }
 

diff --git a/common/lib/plugins/connection_tracker/opened_connection_tracker.ts b/common/lib/plugins/connection_tracker/opened_connection_tracker.ts
@@ -111,7 +111,6 @@ export class OpenedConnectionTracker {
       }
     }
     console.log(`Opened Connections Tracked: \n\t${str}`);
-    console.log(logTopology(this.pluginService.getHosts(), "logging connections topology : "));
   }
 
   private logConnectionQueue(host: string, queue: Array<WeakRef<ClientWrapper>>): void {

diff --git a/common/lib/plugins/failover/failover_plugin.ts b/common/lib/plugins/failover/failover_plugin.ts
@@ -172,7 +172,7 @@ export class FailoverPlugin extends AbstractConnectionPlugin {
     }
 
     // Log changes
-    if (logger.level === "silly") {
+    if (logger.level === "debug") {
       let str = "Changes:";
       for (const [key, values] of changes.entries()) {
         str = str.concat("\n");
@@ -189,7 +189,6 @@ export class FailoverPlugin extends AbstractConnectionPlugin {
     if (currentHost) {
       const url = currentHost.url;
       if (this.isHostStillValid(url, changes)) {
-        console.log("url still valid: " + url);
         return Promise.resolve();
       }
 
@@ -440,7 +439,7 @@ export class FailoverPlugin extends AbstractConnectionPlugin {
 
           await this.pluginService.abortCurrentClient();
           await this.pluginService.setCurrentClient(result.client, writerHostInfo);
-          console.log(Messages.get("Failover.establishedConnection", this.pluginService.getCurrentHostInfo()?.host ?? ""));
+          logger.debug(Messages.get("Failover.establishedConnection", this.pluginService.getCurrentHostInfo()?.host ?? ""));
           await this.pluginService.refreshHostList();
           this.failoverWriterSuccessCounter.inc();
         } catch (error: any) {
@@ -547,7 +546,6 @@ export class FailoverPlugin extends AbstractConnectionPlugin {
   }
 
   private canDirectExecute(methodName: string): boolean {
-    console.log("methodNamedirect " + methodName);
     return methodName === FailoverPlugin.METHOD_END;
   }
 

diff --git a/common/lib/plugins/failover/writer_failover_handler.ts b/common/lib/plugins/failover/writer_failover_handler.ts
@@ -20,14 +20,13 @@ import { ClusterAwareReaderFailoverHandler } from "./reader_failover_handler";
 import { PluginService } from "../../plugin_service";
 import { HostAvailability } from "../../host_availability/host_availability";
 import { AwsWrapperError } from "../../utils/errors";
-import { getWriter, logTopology, maskProperties, sleep } from "../../utils/utils";
+import { getWriter, logTopology, maskProperties } from "../../utils/utils";
 import { ReaderFailoverResult } from "./reader_failover_result";
 import { Messages } from "../../utils/messages";
 import { logger } from "../../../logutils";
 import { WrapperProperties } from "../../wrapper_property";
 import { ClientWrapper } from "../../client_wrapper";
 import { FailoverRestriction } from "./failover_restriction";
-import { HostRole } from "../../host_role";
 
 export interface WriterFailoverHandler {
   failover(currentTopology: HostInfo[]): Promise<WriterFailoverResult>;
@@ -269,7 +268,6 @@ class ReconnectToWriterHandlerTask {
     } finally {
       if (this.currentClient && (this.failoverCompletedDueToError || !success)) {
         await this.pluginService.abortTargetClient(this.currentClient);
-
       }
       logger.info(Messages.get("ClusterAwareWriterFailoverHandler.taskAFinished"));
     }
@@ -283,7 +281,6 @@ class ReconnectToWriterHandlerTask {
     // Task B was returned.
     if (selectedTask && selectedTask === ClusterAwareWriterFailoverHandler.WAIT_NEW_WRITER_TASK) {
       await this.pluginService.abortTargetClient(this.currentClient);
-
     }
   }
 }

diff --git a/common/lib/utils/locales/en.json b/common/lib/utils/locales/en.json
diff --git a/pg/lib/client.ts b/pg/lib/client.ts
@@ -174,7 +174,6 @@ export class AwsPGClient extends AwsClient {
   }
 
   async end() {
-    console.log(logTopology(this.pluginService.getHosts(), "calling end topology : "));
     if (!this.isConnected || !this.targetClient) {
       // No connections have been initialized.
       // This might happen if end is called in a finally block when an error occurred while initializing the first connection.

diff --git a/pg/lib/dialect/aurora_pg_database_dialect.ts b/pg/lib/dialect/aurora_pg_database_dialect.ts
@@ -68,8 +68,7 @@ export class AuroraPgDatabaseDialect extends PgDatabaseDialect implements Topolo
   async getHostRole(targetClient: ClientWrapper): Promise<HostRole> {
     const res = await targetClient.query(AuroraPgDatabaseDialect.IS_READER_QUERY);
     console.log("gethostrole: " + res.rows[0]["is_reader"]);
-    const val = res.rows[0]["is_reader"] === true ? HostRole.READER : HostRole.WRITER;
-    return Promise.resolve(val)
+    return Promise.resolve(res.rows[0]["is_reader"] === true ? HostRole.READER : HostRole.WRITER);
   }
 
   async isDialect(targetClient: ClientWrapper): Promise<boolean> {

diff --git a/tests/plugin_manager_benchmarks.ts b/tests/plugin_manager_benchmarks.ts
@@ -283,7 +283,7 @@ suite(
   }),
 
   add("initHostProviderWith10Plugins", async () => {
-    const pluginManagerWithPlugins = await initPluginManagerWithPlugins(10, instance(mockPluginService), propsWithPlugins);;
+    const pluginManagerWithPlugins = await initPluginManagerWithPlugins(10, instance(mockPluginService), propsWithPlugins);
     return async () =>
       await pluginManagerWithPlugins.initHostProvider(
         new HostInfoBuilder({ hostAvailabilityStrategy: new SimpleHostAvailabilityStrategy() }).withHost("host").build(),
@@ -325,7 +325,7 @@ suite(
   }),
 
   add("notifyConnectionChangedWith10Plugins", async () => {
-    const pluginManagerWithPlugins = await initPluginManagerWithPlugins(10, instance(mockPluginService), propsWithPlugins);;
+    const pluginManagerWithPlugins = await initPluginManagerWithPlugins(10, instance(mockPluginService), propsWithPlugins);
     return async () =>
       await pluginManagerWithPlugins.notifyConnectionChanged(new Set<HostChangeOptions>([HostChangeOptions.INITIAL_CONNECTION]), null);
   }),
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,7 +111,6 @@ export class OpenedConnectionTracker { @@
           }
         }
         console.log(`Opened Connections Tracked: \n\t${str}`);
-        console.log(logTopology(this.pluginService.getHosts(), "logging connections topology : "));
       }
       private logConnectionQueue(host: string, queue: Array<WeakRef<ClientWrapper>>): void {
@@ Expand Down @@