Skip to content

Commit 5812d6a

Browse files
committed
fix docker logs and db #1019
1 parent 083f193 commit 5812d6a

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

entrypoint.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#!/bin/sh
22

3-
./sui migrate
4-
./sui
3+
DB_PATH="${SUI_DB_FOLDER:-/app/db}/s-ui.db"
4+
if [ -f "$DB_PATH" ]; then
5+
./sui migrate
6+
fi
7+
8+
exec ./sui

logger/logger.go

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,26 @@ func InitLogger(level logging.Level) {
2323
var backend logging.Backend
2424
var format logging.Formatter
2525

26-
backend, err = logging.NewSyslogBackend("")
27-
if err != nil {
28-
fmt.Println("Unable to use syslog: " + err.Error())
29-
backend = logging.NewLogBackend(os.Stderr, "", 0)
26+
_, inContainer := os.LookupEnv("container")
27+
if !inContainer {
28+
if _, statErr := os.Stat("/.dockerenv"); statErr == nil {
29+
inContainer = true
30+
}
3031
}
31-
if err != nil {
32+
if inContainer {
33+
backend = logging.NewLogBackend(os.Stderr, "", 0)
3234
format = logging.MustStringFormatter(`%{time:2006/01/02 15:04:05} %{level} - %{message}`)
3335
} else {
34-
format = logging.MustStringFormatter(`%{level} - %{message}`)
36+
backend, err = logging.NewSyslogBackend("")
37+
if err != nil {
38+
fmt.Println("Unable to use syslog: " + err.Error())
39+
backend = logging.NewLogBackend(os.Stderr, "", 0)
40+
}
41+
if err != nil {
42+
format = logging.MustStringFormatter(`%{time:2006/01/02 15:04:05} %{level} - %{message}`)
43+
} else {
44+
format = logging.MustStringFormatter(`%{level} - %{message}`)
45+
}
3546
}
3647

3748
backendFormatter := logging.NewBackendFormatter(backend, format)

0 commit comments

Comments
 (0)