From 7b05a88a6ba9f86a74ce8f565e3ff421cd7ef3f6 Mon Sep 17 00:00:00 2001 From: Nikitin Aleksandr Date: Thu, 15 May 2025 14:29:04 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20defer=20?= =?UTF-8?q?stopapp.GetWaitGroup=5FMain().Done()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chatgpt_connect/chatgpt_connect.go | 2 +- chatgpt_proxy/chatgpt_proxy.go | 2 +- email/email.go | 2 +- email_imap/email_imap.go | 2 +- fiber_connect/fiber_connect.go | 2 +- kafka_connect/kafka_connect.go | 2 +- minio_connect/minio_connect.go | 2 +- mssql_connect/mssql_connect.go | 2 +- mssql_gorm/mssql_gorm.go | 2 +- nats_connect/nats_connect.go | 2 +- nats_liveness/nats_liveness.go | 2 +- postgres_gorm/postgres_gorm.go | 2 +- postgres_gorm2/postgres_gorm2.go | 4 ++-- postgres_pgx/postgres_pgx.go | 6 +++--- postgres_sqlx/postgres_sqlx.go | 6 +++--- postgres_stek/postgres_stek.go | 4 ++-- stopapp/stopapp.go | 2 +- sync_exchange_connect/sync_exchange_connect.go | 6 +++--- telegram_client/telegram_client.go | 4 ++-- whatsapp_connect/whatsapp_connect.go | 4 ++-- 20 files changed, 30 insertions(+), 30 deletions(-) diff --git a/chatgpt_connect/chatgpt_connect.go b/chatgpt_connect/chatgpt_connect.go index 6c0c513e..791c8dc8 100644 --- a/chatgpt_connect/chatgpt_connect.go +++ b/chatgpt_connect/chatgpt_connect.go @@ -132,7 +132,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. chatgpt_connect") } // diff --git a/chatgpt_proxy/chatgpt_proxy.go b/chatgpt_proxy/chatgpt_proxy.go index fa7013ca..cf1febba 100644 --- a/chatgpt_proxy/chatgpt_proxy.go +++ b/chatgpt_proxy/chatgpt_proxy.go @@ -128,7 +128,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. chatgpt_proxy") } // diff --git a/email/email.go b/email/email.go index 12cd26bf..85993911 100644 --- a/email/email.go +++ b/email/email.go @@ -231,7 +231,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. email") } // diff --git a/email_imap/email_imap.go b/email_imap/email_imap.go index 0e675b4e..9a857210 100644 --- a/email_imap/email_imap.go +++ b/email_imap/email_imap.go @@ -261,7 +261,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. email_imap") } // diff --git a/fiber_connect/fiber_connect.go b/fiber_connect/fiber_connect.go index 6932c997..c4adb649 100644 --- a/fiber_connect/fiber_connect.go +++ b/fiber_connect/fiber_connect.go @@ -106,7 +106,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. fiber_connect") } //ждём пока отправляемых сейчас сообщений будет =0 diff --git a/kafka_connect/kafka_connect.go b/kafka_connect/kafka_connect.go index 8a445db8..e2b438c8 100644 --- a/kafka_connect/kafka_connect.go +++ b/kafka_connect/kafka_connect.go @@ -173,7 +173,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. kafka_connect") } // diff --git a/minio_connect/minio_connect.go b/minio_connect/minio_connect.go index 5a46021d..5b2f9469 100644 --- a/minio_connect/minio_connect.go +++ b/minio_connect/minio_connect.go @@ -186,7 +186,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. minio_connect") } // diff --git a/mssql_connect/mssql_connect.go b/mssql_connect/mssql_connect.go index e94569a1..1077b37d 100644 --- a/mssql_connect/mssql_connect.go +++ b/mssql_connect/mssql_connect.go @@ -194,7 +194,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. mssql_connect") } // diff --git a/mssql_gorm/mssql_gorm.go b/mssql_gorm/mssql_gorm.go index 885d2624..b694eb56 100644 --- a/mssql_gorm/mssql_gorm.go +++ b/mssql_gorm/mssql_gorm.go @@ -208,7 +208,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. mssql_gorm") } // diff --git a/nats_connect/nats_connect.go b/nats_connect/nats_connect.go index c5a45170..09724e18 100644 --- a/nats_connect/nats_connect.go +++ b/nats_connect/nats_connect.go @@ -135,7 +135,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled. NATS_Connect.") + log.Warn("Context app is canceled. nats_connect.") } CloseConnection() diff --git a/nats_liveness/nats_liveness.go b/nats_liveness/nats_liveness.go index cb26cae5..b615b2c3 100644 --- a/nats_liveness/nats_liveness.go +++ b/nats_liveness/nats_liveness.go @@ -257,7 +257,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled. NATS_Liveness.") + log.Warn("Context app is canceled. nats_liveness.") } if Ticker != nil { diff --git a/postgres_gorm/postgres_gorm.go b/postgres_gorm/postgres_gorm.go index bea780e3..5ecf2df1 100644 --- a/postgres_gorm/postgres_gorm.go +++ b/postgres_gorm/postgres_gorm.go @@ -266,7 +266,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled. Postgres gorm.") + log.Warn("Context app is canceled. postgres_gorm") } // diff --git a/postgres_gorm2/postgres_gorm2.go b/postgres_gorm2/postgres_gorm2.go index 2e1d133c..6362ca9f 100644 --- a/postgres_gorm2/postgres_gorm2.go +++ b/postgres_gorm2/postgres_gorm2.go @@ -268,7 +268,7 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled. Postgres gorm.") + log.Warn("Context app is canceled. postgres_gorm2") } // @@ -456,7 +456,7 @@ loop: for { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled. postgres_gorm.ping") + log.Warn("Context app is canceled. postgres_gorm2.ping") break loop case <-ticker.C: err = port_checker.CheckPort_err(Settings.DB_HOST, Settings.DB_PORT) diff --git a/postgres_pgx/postgres_pgx.go b/postgres_pgx/postgres_pgx.go index 96e0f31b..63ff3a71 100644 --- a/postgres_pgx/postgres_pgx.go +++ b/postgres_pgx/postgres_pgx.go @@ -237,7 +237,7 @@ func CloseConnection_err() error { mutex_Connect.Lock() defer mutex_Connect.Unlock() - err := GetConnection().Close(ctx) + err := Conn.Close(ctx) return err } @@ -248,11 +248,11 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. postgres_pgx") } // - stopapp.WaitTotalMessagesSendingNow("Postgres pgx") + stopapp.WaitTotalMessagesSendingNow("postgres_pgx") // CloseConnection() diff --git a/postgres_sqlx/postgres_sqlx.go b/postgres_sqlx/postgres_sqlx.go index f4d48405..09326e44 100644 --- a/postgres_sqlx/postgres_sqlx.go +++ b/postgres_sqlx/postgres_sqlx.go @@ -204,11 +204,11 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. postgres_sqlx") } // - stopapp.WaitTotalMessagesSendingNow("Postgres sqlx") + stopapp.WaitTotalMessagesSendingNow("postgres_sqlx") // err := CloseConnection() @@ -316,7 +316,7 @@ loop: for { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled. postgres_connect.ping") + log.Warn("Context app is canceled. postgres_sqlx.ping") break loop case <-ticker.C: err = port_checker.CheckPort_err(Settings.DB_HOST, Settings.DB_PORT) diff --git a/postgres_stek/postgres_stek.go b/postgres_stek/postgres_stek.go index 94487a37..7a5d1105 100644 --- a/postgres_stek/postgres_stek.go +++ b/postgres_stek/postgres_stek.go @@ -264,11 +264,11 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. postgres_stek") } // - stopapp.WaitTotalMessagesSendingNow("Postgres stek") + stopapp.WaitTotalMessagesSendingNow("postgres_stek") // CloseConnectionAll() diff --git a/stopapp/stopapp.go b/stopapp/stopapp.go index 21c54ab7..167115b9 100644 --- a/stopapp/stopapp.go +++ b/stopapp/stopapp.go @@ -115,7 +115,7 @@ func WaitStop() { contextmain.CancelContext() } case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. stopapp") } GetWaitGroup_Main().Done() diff --git a/sync_exchange_connect/sync_exchange_connect.go b/sync_exchange_connect/sync_exchange_connect.go index f7db5297..0182631b 100644 --- a/sync_exchange_connect/sync_exchange_connect.go +++ b/sync_exchange_connect/sync_exchange_connect.go @@ -123,11 +123,11 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled. NATS.") + log.Warn("Context app is canceled. sync_exchange_connect") } //ждём пока отправляемых сейчас сообщений будет =0 - stopapp.WaitTotalMessagesSendingNow("nats SyncExchange") + stopapp.WaitTotalMessagesSendingNow("sync_exchange_connect") //закрываем соединение CloseConnection() @@ -176,7 +176,7 @@ loop: for { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled. postgres_pgx.ping") + log.Warn("Context app is canceled. sync_exchange_connect.ping") break loop case <-ticker.C: err = PprofNats1() diff --git a/telegram_client/telegram_client.go b/telegram_client/telegram_client.go index 2abb5a2c..9c5ba8ce 100644 --- a/telegram_client/telegram_client.go +++ b/telegram_client/telegram_client.go @@ -759,11 +759,11 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. telegram_client") } // - stopapp.WaitTotalMessagesSendingNow("telegram") + stopapp.WaitTotalMessagesSendingNow("telegram_client") // CloseConnection() diff --git a/whatsapp_connect/whatsapp_connect.go b/whatsapp_connect/whatsapp_connect.go index d55f5a3d..c00f335b 100644 --- a/whatsapp_connect/whatsapp_connect.go +++ b/whatsapp_connect/whatsapp_connect.go @@ -235,11 +235,11 @@ func WaitStop() { select { case <-contextmain.GetContext().Done(): - log.Warn("Context app is canceled.") + log.Warn("Context app is canceled. whatsapp_connect") } // - stopapp.WaitTotalMessagesSendingNow("whatsapp") + stopapp.WaitTotalMessagesSendingNow("whatsapp_connect") // StopWhatsApp()