mirror of
https://github.com/binwiederhier/ntfy.git
synced 2026-11-10 14:44:04 +08:00
Merge remote-tracking branch 'origin/main' into up-payer
# Conflicts: # docs/releases.md
This commit is contained in:
commit
b65e642d05
16 files changed
+149
-97
No files matched your search
+2
-2
@@ -563,8 +563,8 @@ func (s *Server) Run() error {
|
||||
s.adminUnixListener, err = s.listenAdminSocket()
|
||||
if err != nil {
|
||||
s.mu.Unlock()
|
||||
// Not fatal, unlike the other listeners: the CLI falls back to writing to the database (deprecated)
|
||||
log.Tag(tagStartup).Err(err).Warn("Admin socket %s not available, 'ntfy user/access/token/tier' will write to the database directly, which is deprecated, see https://ntfy.sh/docs/deprecations/", s.config.ListenAdminUnix)
|
||||
// Not fatal, unlike the other listeners: nothing depends on the (experimental) admin socket yet
|
||||
log.Tag(tagStartup).Err(err).Warn("Admin socket %s not available", s.config.ListenAdminUnix)
|
||||
return
|
||||
}
|
||||
defer s.adminUnixListener.Close()
|
||||
|
||||
Reference in new issue
Block a user