Merge pull request #143 from picosh/am/send-log-sink

Setup a send log sink

.github/workflows/build.yml

@@ -76,6 +76,25 @@ jobs:
         platforms: ${{ env.PLATFORMS }}
         registry: ${{ env.REGISTRY }}
         ssh: false
+  build-pico:
+    runs-on: ubuntu-22.04
+    needs: test
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v3
+    - name: Setup docker
+      uses: ./.github/actions/setup
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Run docker build for pico
+      uses: ./.github/actions/build
+      with:
+        app: pico
+        platforms: ${{ env.PLATFORMS }}
+        registry: ${{ env.REGISTRY }}
+        web: false
   build-bouncer:
     runs-on: ubuntu-22.04
     needs: test

docker-compose.prod.yml

@@ -74,6 +74,8 @@ services:
           - web
     env_file:
       - .env.prod
+    volumes:
+      - ./data/pastes-ssh/data:/app/ssh_data
   pastes-ssh:
     networks:
       pastes:
@@ -116,6 +118,8 @@ services:
           - web
     env_file:
       - .env.prod
+    volumes:
+      - ./data/pubsub-ssh/data:/app/ssh_data
   pubsub-ssh:
     networks:
       pubsub:
@@ -158,6 +162,8 @@ services:
           - web
     env_file:
       - .env.prod
+    volumes:
+      - ./data/prose-ssh/data:/app/ssh_data
   prose-ssh:
     networks:
       prose:
@@ -202,6 +208,7 @@ services:
       - .env.prod
     volumes:
       - ./data/storage/data:/app/.storage
+      - ./data/imgs-ssh/data:/app/ssh_data
   imgs-ssh:
     networks:
       imgs:
@@ -248,6 +255,7 @@ services:
       - .env.prod
     volumes:
       - ./data/storage/data:/app/.storage
+      - ./data/pgs-ssh/data:/app/ssh_data
   pgs-ssh:
     networks:
       pgs:
@@ -296,6 +304,8 @@ services:
           - web
     env_file:
       - .env.prod
+    volumes:
+      - ./data/feeds-ssh/data:/app/ssh_data
   feeds-ssh:
     networks:
       feeds:

pubsub/cli.go

@@ -148,14 +148,16 @@ func WishMiddleware(handler *CliHandler) wish.Middleware {
 				return
 			}
 
+			isAdmin := handler.DBPool.HasFeatureForUser(user.ID, "admin")
+
 			cmd := strings.TrimSpace(args[0])
 			if cmd == "help" {
 				wish.Println(sesh, helpStr(toSshCmd(handler.Cfg)))
 				next(sesh)
 				return
 			} else if cmd == "ls" {
 				topicFilter := fmt.Sprintf("%s/", user.Name)
-				if handler.DBPool.HasFeatureForUser(user.ID, "admin") {
+				if isAdmin {
 					topicFilter = ""
 				}
 
@@ -252,10 +254,18 @@ func WishMiddleware(handler *CliHandler) wish.Middleware {
 				if topic == "" {
 					topic = uuid.NewString()
 				}
-				name := toTopic(user.Name, topic)
-				if *public {
-					name = toPublicTopic(topic)
+
+				var name string
+
+				if isAdmin && strings.HasPrefix(topic, "/") {
+					name = strings.TrimPrefix(topic, "/")
+				} else {
+					name = toTopic(user.Name, topic)
+					if *public {
+						name = toPublicTopic(topic)
+					}
 				}
+
 				wish.Printf(
 					sesh,
 					"subscribe to this channel:\n\tssh %s sub %s\n",
@@ -363,9 +373,15 @@ func WishMiddleware(handler *CliHandler) wish.Middleware {
 					"topic", topic,
 				)
 
-				name := toTopic(user.Name, topic)
-				if *public {
-					name = toPublicTopic(topic)
+				var name string
+
+				if isAdmin && strings.HasPrefix(topic, "/") {
+					name = strings.TrimPrefix(topic, "/")
+				} else {
+					name = toTopic(user.Name, topic)
+					if *public {
+						name = toPublicTopic(topic)
+					}
 				}
 
 				err = pubsub.Sub(
@@ -405,10 +421,18 @@ func WishMiddleware(handler *CliHandler) wish.Middleware {
 				if isCreator {
 					topic = uuid.NewString()
 				}
-				name := toTopic(user.Name, topic)
-				if *public {
-					name = toPublicTopic(topic)
+
+				var name string
+
+				if isAdmin && strings.HasPrefix(topic, "/") {
+					name = strings.TrimPrefix(topic, "/")
+				} else {
+					name = toTopic(user.Name, topic)
+					if *public {
+						name = toPublicTopic(topic)
+					}
 				}
+
 				if isCreator {
 					wish.Printf(
 						sesh,

shared/config.go

@@ -271,7 +271,19 @@ func CreateLogger(space string) *slog.Logger {
 	log := slog.New(
 		slog.NewTextHandler(os.Stdout, opts),
 	)
-	return log.With("service", space)
+
+	newLogger := log
+
+	if strings.ToLower(GetEnv("PICO_SENDLOG_ENABLED", "true")) == "true" {
+		newLog, err := SendLogRegister(log, 100)
+		if err == nil {
+			newLogger = newLog
+		} else {
+			slog.Error("unable to start send logger", "error", err)
+		}
+	}
+
+	return newLogger.With("service", space)
 }
 
 func LoggerWithUser(logger *slog.Logger, user *db.User) *slog.Logger {