daren.hsu/webhook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed Service variable

Browse Source
This commit is contained in:
Cameron Moore 2020-12-27 23:37:23 -06:00
parent b82e15e836
commit 1c72898604
No known key found for this signature in database
GPG Key ID: AF96E12468D7553E
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webhook.go
View File

@ -60,7 +60,7 @@ var (
watcher *fsnotify.Watcher watcher *fsnotify.Watcher
signals chan os.Signal signals chan os.Signal
S *service.Service Service *service.Service
) )
func matchLoadedHook(id string) *hook.Hook { func matchLoadedHook(id string) *hook.Hook {
@ -112,25 +112,25 @@ func main() {
} }
// Setup a new Service instance // Setup a new Service instance
S = service.New(*ip, *port) Service = service.New(*ip, *port)
// We must setup TLS prior to opening a listening port. // We must setup TLS prior to opening a listening port.
if *secure { if *secure {
S.SetTLSEnabled() Service.SetTLSEnabled()
err := S.SetTLSKeyPair(*cert, *key) err := Service.SetTLSKeyPair(*cert, *key)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)
} }
err = S.SetTLSMinVersion(*tlsMinVersion) err = Service.SetTLSMinVersion(*tlsMinVersion)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)
} }
S.SetTLSCiphers(*tlsCipherSuites) Service.SetTLSCiphers(*tlsCipherSuites)
} }
// logQueue is a queue for log messages encountered during startup. We need // logQueue is a queue for log messages encountered during startup. We need
@ -139,7 +139,7 @@ func main() {
var logQueue []string var logQueue []string
// Open listener early so we can drop privileges. // Open listener early so we can drop privileges.
err := S.Listen() err := Service.Listen()
if err != nil { if err != nil {
logQueue = append(logQueue, fmt.Sprintf("error listening on port: %s", err)) logQueue = append(logQueue, fmt.Sprintf("error listening on port: %s", err))
// we'll bail out below // we'll bail out below
@ -182,7 +182,7 @@ func main() {
if *pidPath != "" { if *pidPath != "" {
var err error var err error
err = S.CreatePIDFile(*pidPath) err = Service.CreatePIDFile(*pidPath)
if err != nil { if err != nil {
log.Fatalf("Error creating pidfile: %v", err) log.Fatalf("Error creating pidfile: %v", err)
} }
@ -190,7 +190,7 @@ func main() {
defer func() { defer func() {
// NOTE(moorereason): my testing shows that this doesn't work with // NOTE(moorereason): my testing shows that this doesn't work with
// ^C, so we also do a Remove in the signal handler elsewhere. // ^C, so we also do a Remove in the signal handler elsewhere.
if nerr := S.DeletePIDFile(); nerr != nil { if nerr := Service.DeletePIDFile(); nerr != nil {
log.Print(nerr) log.Print(nerr)
} }
}() }()
@ -199,7 +199,7 @@ func main() {
log.Println("version " + version + " starting") log.Println("version " + version + " starting")
// set os signal watcher // set os signal watcher
setupSignals(S) setupSignals(Service)
// load and parse hooks // load and parse hooks
if len(hooksFiles) == 0 { if len(hooksFiles) == 0 {
@ -291,15 +291,15 @@ func main() {
r.HandleFunc(hooksURL, hookHandler) r.HandleFunc(hooksURL, hookHandler)
// Create common HTTP server settings // Create common HTTP server settings
S.SetHTTPHandler(r) Service.SetHTTPHandler(r)
if !*secure { if !*secure {
log.Printf("serving hooks on http://%s%s", S.Address, makeHumanPattern(hooksURLPrefix)) log.Printf("serving hooks on http://%s%s", Service.Address, makeHumanPattern(hooksURLPrefix))
} else { } else {
log.Printf("serving hooks on https://%s%s", S.Address, makeHumanPattern(hooksURLPrefix)) log.Printf("serving hooks on https://%s%s", Service.Address, makeHumanPattern(hooksURLPrefix))
} }
log.Print(S.Serve()) log.Print(Service.Serve())
} }
func hookHandler(w http.ResponseWriter, r *http.Request) { func hookHandler(w http.ResponseWriter, r *http.Request) {