fix docker logs and db #1019
This commit is contained in:
+6
-2
@@ -1,4 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
./sui migrate
|
DB_PATH="${SUI_DB_FOLDER:-/app/db}/s-ui.db"
|
||||||
./sui
|
if [ -f "$DB_PATH" ]; then
|
||||||
|
./sui migrate
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec ./sui
|
||||||
+17
-6
@@ -23,15 +23,26 @@ func InitLogger(level logging.Level) {
|
|||||||
var backend logging.Backend
|
var backend logging.Backend
|
||||||
var format logging.Formatter
|
var format logging.Formatter
|
||||||
|
|
||||||
backend, err = logging.NewSyslogBackend("")
|
_, inContainer := os.LookupEnv("container")
|
||||||
if err != nil {
|
if !inContainer {
|
||||||
fmt.Println("Unable to use syslog: " + err.Error())
|
if _, statErr := os.Stat("/.dockerenv"); statErr == nil {
|
||||||
backend = logging.NewLogBackend(os.Stderr, "", 0)
|
inContainer = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if err != nil {
|
if inContainer {
|
||||||
|
backend = logging.NewLogBackend(os.Stderr, "", 0)
|
||||||
format = logging.MustStringFormatter(`%{time:2006/01/02 15:04:05} %{level} - %{message}`)
|
format = logging.MustStringFormatter(`%{time:2006/01/02 15:04:05} %{level} - %{message}`)
|
||||||
} else {
|
} else {
|
||||||
format = logging.MustStringFormatter(`%{level} - %{message}`)
|
backend, err = logging.NewSyslogBackend("")
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Unable to use syslog: " + err.Error())
|
||||||
|
backend = logging.NewLogBackend(os.Stderr, "", 0)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
format = logging.MustStringFormatter(`%{time:2006/01/02 15:04:05} %{level} - %{message}`)
|
||||||
|
} else {
|
||||||
|
format = logging.MustStringFormatter(`%{level} - %{message}`)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
backendFormatter := logging.NewBackendFormatter(backend, format)
|
backendFormatter := logging.NewBackendFormatter(backend, format)
|
||||||
|
|||||||
Reference in New Issue
Block a user