github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 14:52:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move certmagic import out of caddy package (#2807)

Browse Source
This commit is contained in:
Jonathan Rudenberg 2019-10-14 12:07:36 -04:00 committed by Matt Holt
parent 24b2e02ee5
commit 99914d2204
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
caddy/caddymain/run.go
View File

@ -83,6 +83,7 @@ func Run() {
caddy.AppName = appName caddy.AppName = appName
caddy.AppVersion = module.Version caddy.AppVersion = module.Version
caddy.OnProcessExit = append(caddy.OnProcessExit, certmagic.CleanUpOwnLocks)
certmagic.UserAgent = appName + "/" + cleanModVersion certmagic.UserAgent = appName + "/" + cleanModVersion
// Set up process log before anything bad happens // Set up process log before anything bad happens

3
sigtrap.go
View File

@ -21,7 +21,6 @@ import (
"sync" "sync"
"github.com/caddyserver/caddy/telemetry" "github.com/caddyserver/caddy/telemetry"
"github.com/mholt/certmagic"
) )
// TrapSignals create signal handlers for all applicable signals for this // TrapSignals create signal handlers for all applicable signals for this
@ -50,7 +49,6 @@ func trapSignalsCrossPlatform() {
for _, f := range OnProcessExit { for _, f := range OnProcessExit {
f() // important cleanup actions only f() // important cleanup actions only
} }
certmagic.CleanUpOwnLocks()
os.Exit(2) os.Exit(2)
} }
@ -65,7 +63,6 @@ func trapSignalsCrossPlatform() {
} }
go func() { go func() {
certmagic.CleanUpOwnLocks()
os.Exit(executeShutdownCallbacks("SIGINT")) os.Exit(executeShutdownCallbacks("SIGINT"))
}() }()
} }

3
sigtrap_posix.go
View File

@ -23,7 +23,6 @@ import (
"syscall" "syscall"
"github.com/caddyserver/caddy/telemetry" "github.com/caddyserver/caddy/telemetry"
"github.com/mholt/certmagic"
) )
// trapSignalsPosix captures POSIX-only signals. // trapSignalsPosix captures POSIX-only signals.
@ -39,7 +38,6 @@ func trapSignalsPosix() {
for _, f := range OnProcessExit { for _, f := range OnProcessExit {
f() // only perform important cleanup actions f() // only perform important cleanup actions
} }
certmagic.CleanUpOwnLocks()
os.Exit(0) os.Exit(0)
case syscall.SIGTERM: case syscall.SIGTERM:
@ -57,7 +55,6 @@ func trapSignalsPosix() {
telemetry.AppendUnique("sigtrap", "SIGTERM") telemetry.AppendUnique("sigtrap", "SIGTERM")
go telemetry.StopEmitting() // won't finish in time, but that's OK - just don't block go telemetry.StopEmitting() // won't finish in time, but that's OK - just don't block
certmagic.CleanUpOwnLocks()
os.Exit(exitCode) os.Exit(exitCode)
case syscall.SIGUSR1: case syscall.SIGUSR1: