add ports exposing rules for main

app/app.go

@@ -11,11 +11,9 @@ import (
 	"gitea.pena/PenaSide/trashlog/server"
 	"gitea.pena/PenaSide/trashlog/sink"
 	"gitea.pena/PenaSide/trashlog/version"
-	"gitea.pena/PenaSide/trashlog/wrappers/zaptg"
 	"github.com/skeris/appInit"
 	"gitea.pena/PenaSide/hlog"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc"
 	"net"
 )
@@ -105,21 +103,6 @@ func New(ctx context.Context, opts interface{}, ver appInit.Version) (appInit.Co
 		zap.String("SvcVersion", version.Release),
 		zap.String("SvcBuildTime", version.BuildTime),
 	)
-	tel, err := zaptg.NewCore(
-		ctx,
-		zap.InfoLevel,
-		options.TelegramToken,
-		version.Release,
-		version.Commit,
-		0,
-		int64(options.TelegramChannelID)*-1,
-	)
-	if err != nil {
-		panic(err)
-	}
-	logger = logger.WithOptions(zap.WrapCore(func(core zapcore.Core) zapcore.Core {
-		return zapcore.NewTee(core, tel)
-	}))
 
 	log := hlog.New(logger)
 	log.Emit(InfoSvcStarted{})

deployments/main/docker-compose.yaml

@@ -1,8 +1,8 @@
 services:
-  trashlog:
-    hostname: trashlog
-    container_name: trashlog
-    image: gitea.pena/penaside/trashlog/staging:$GITHUB_RUN_NUMBER
+  trashlog_main:
+    hostname: trashlog_main
+    container_name: trashlog_main
+    image: gitea.pena/penaside/trashlog/main:400
     tty: true
     environment:
       DEVELOPMENT: false
@@ -11,9 +11,9 @@ services:
       ADMIN_HTTP_URL: "0.0.0.0:8000"
       CLICKHOUSE_URL: "clickhouse://clickhouse.pena:9000/default?sslmode=disable"
       DB_PATH: "./recover.bolt"
-      CLICKHOUSE_TABLE_MAIN_NAME: "staging"
+      CLICKHOUSE_TABLE_MAIN_NAME: "statistics"
     volumes:
       - /etc/timezone:/etc/timezone:ro
     ports:
-      - 7113:7113
-      - 7114:8000
+      - 7123:7113
+      - 7124:8000

deployments/staging/docker-compose.yaml

@@ -2,7 +2,7 @@ services:
   trashlog:
     hostname: trashlog
     container_name: trashlog
-    image: gitea.pena/penaside/trashlog/staging:140
+    image: gitea.pena/penaside/trashlog/staging:401
     tty: true
     environment:
       DEVELOPMENT: false

sink/sink.go

@@ -89,12 +89,18 @@ func (s *Sink) Valve(stream trashlogProto.Trashlog_ValveServer) error {
 
 	go func() {
 		for {
+      select {
+      case <-ctxChan.Done():
+        return
+      default:
 			record, err := stream.Recv()
 			if err != nil {
 				fmt.Println("RECV ERR", err)
 				return
 			}
+      
 			dataChan <- record
+    }
 		}
 	}()