adam
/
riffraff
1
0
Fork 0
Code Issues 5 Pull Requests 1 Releases Activity

make -accessLog flag actually work

remotes/origin/persistence
Adam Veldhousen 2019-11-19 09:31:35 -06:00
parent 685a2896ab
commit 8b1945df7e
Signed by: adam
GPG Key ID: 6DB29003C6DD1E4B
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/http.go
View File

@ -38,19 +38,26 @@ func searchHandler(scs *CommandHandler, shortcutStore *ShortcutStore, logAccess
return func(res http.ResponseWriter, req *http.Request) { return func(res http.ResponseWriter, req *http.Request) {
v := req.URL.Query() v := req.URL.Query()
commandString := v.Get("q") commandString := v.Get("q")
action, err := scs.Handle(commandString) action, err := scs.Handle(commandString)
if err != nil { if err != nil {
accessLogger.Printf("'%s' -> got error: '%s'", commandString, err.Error()) if logAccess {
accessLogger.Printf("'%s' -> got error: '%s'", commandString, err.Error())
}
http.Redirect(res, req, fmt.Sprintf("https://duckduckgo.com?q=%s", commandString), http.StatusFound) http.Redirect(res, req, fmt.Sprintf("https://duckduckgo.com?q=%s", commandString), http.StatusFound)
return return
} }
accessLogger.Printf("'%s' %s -> 302 %s", commandString, action.Action, action.Location) accessLogger.Printf("'%s' %s -> 302 %s", commandString, action.Action, action.Location)
if action.Action != "lookup" { if action.Action != "lookup" {
if err := shortcutStore.SaveShortcuts(scs.Shortcuts); err != nil { if err := shortcutStore.SaveShortcuts(scs.Shortcuts, nil); err != nil {
accessLogger.Printf("'%s' %s -> could not save shortcuts database file: %v", commandString, action.Action, err) if logAccess {
accessLogger.Printf("'%s' %s -> could not save shortcuts database file: %v", commandString, action.Action, err)
}
http.Error(res, err.Error(), http.StatusInternalServerError) http.Error(res, err.Error(), http.StatusInternalServerError)
return return
} }
} }