also include logging.yaml files for s3worker and webapp

Author: ciur

logs/s3worker_logging.go

@@ -0,0 +1,23 @@
+package logs
+
+const S3WORKER_LOGGING = `version: 1
+disable_existing_loggers: false
+
+formatters:
+  verbose:
+    format: '%(levelname)s %(asctime)s %(module)s %(message)s'
+
+handlers:
+  console:
+    class: logging.StreamHandler
+    formatter: verbose
+
+loggers:
+  celery:
+    level: DEBUG
+    handlers: [console]
+  s3worker:
+    level: DEBUG
+    handlers: [console]
+    propagate: no
+`

logs/webapp_logging.go

@@ -0,0 +1,20 @@
+package logs
+
+const WEBAPP_LOGGING = `version: 1
+disable_existing_loggers: false
+
+formatters:
+  verbose:
+    format: '%(levelname)s %(asctime)s %(module)s %(message)s'
+
+handlers:
+  console:
+    class: logging.StreamHandler
+    formatter: verbose
+
+loggers:
+  papermerge.core.tasks:
+    level: DEBUG
+    handlers: [console]
+    propagate: no
+`

pmcompose.go

@@ -6,6 +6,7 @@ import (
 	"text/template"
 
 	"github.com/papermerge/pmcompose/ask"
+	"github.com/papermerge/pmcompose/logs"
 	"github.com/papermerge/pmcompose/utils"
 )
 
@@ -100,4 +101,17 @@ func main() {
 	}
 
 	fmt.Println("✅ docker-compose.yml generated successfully.")
+
+	err = os.WriteFile("webapp_logging.yaml", []byte(logs.WEBAPP_LOGGING), 0644)
+	if err != nil {
+		fmt.Println("Error writing webapp_logging.yaml file")
+	}
+
+	if cfg.S3StorageBackend.S3BucketName != "" {
+		err = os.WriteFile("s3worker_logging.yaml", []byte(logs.S3WORKER_LOGGING), 0644)
+		if err != nil {
+			fmt.Println("Error writing s3worker_logging.yaml file")
+		}
+	}
+
 }

pmcompose_templates/docker-compose.yaml.tmpl

@@ -8,13 +8,15 @@ services:
       PAPERMERGE__DATABASE__URL: postgresql://coco:jumbo@db:5432/pmgdb
       PAPERMERGE__REDIS__URL: redis://redis:6379/0
       PAPERMERGE__MAIN__MEDIA_ROOT: /var/media/pmg
+      PAPERMERGE__MAIN__LOGGING_CFG: /etc/papermerge/logging.yaml
     ports:
      - "{{ .WebAppPort }}:80"
     depends_on:
       - db
       - redis
     volumes:
       - media_root:/var/media/pmg
+      - ${PWD}/webapp_logging.yaml:/etc/papermerge/logging.yaml
   path_template_worker:
     image: papermerge/path-tmpl-worker:0.4
     command: worker
@@ -34,6 +36,7 @@ services:
       PAPERMERGE__REDIS__URL: redis://redis:6379/0
       PAPERMERGE__MAIN__MEDIA_ROOT: /var/media/pmg
       PAPERMERGE__S3__BUCKET_NAME: {{ .S3StorageBackend.S3BucketName }}
+      PAPERMERGE__MAIN__LOGGING_CFG: /etc/papermerge/logging.yaml
       S3_WORKER_ARGS: "-Q s3 -c 2"
       AWS_REGION_NAME: {{ .S3StorageBackend.AWSRegionName }}
       AWS_ACCESS_KEY_ID: {{ .S3StorageBackend.AWSAccessKeyID }}
@@ -43,6 +46,7 @@ services:
       - redis
     volumes:
       - media_root:/var/media/pmg
+      - ${PWD}/s3worker_logging.yaml:/etc/papermerge/logging.yaml
 {{- end }}
   db:
     image: postgres:16.1