LogalDeveloper/owncast
0
Fork 0
Code Activity

style fix for error checking (#1170)

Browse Source 
+additional linting
This commit is contained in:
Meisam
2021-07-09 20:16:44 +02:00
committed by GitHub
parent a13e1e75e2
commit 7361578412
22 changed files with 62 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/admin/logs.go
View File

@@ -20,8 +20,7 @@ func GetLogs(w http.ResponseWriter, r *http.Request) {
}
w.Header().Set("Content-Type", "application/json")
err := json.NewEncoder(w).Encode(response)
if err != nil {
if err := json.NewEncoder(w).Encode(response); err != nil {
log.Errorln(err)
}
}
@@ -39,8 +38,7 @@ func GetWarnings(w http.ResponseWriter, r *http.Request) {
}
w.Header().Set("Content-Type", "application/json")
err := json.NewEncoder(w).Encode(response)
if err != nil {
if err := json.NewEncoder(w).Encode(response); err != nil {
log.Errorln(err)
}
}

3
controllers/admin/serverConfig.go
View File

@@ -65,8 +65,7 @@ func GetServerConfig(w http.ResponseWriter, r *http.Request) {
}
w.Header().Set("Content-Type", "application/json")
err := json.NewEncoder(w).Encode(response)
if err != nil {
if err := json.NewEncoder(w).Encode(response); err != nil {
log.Errorln(err)
}
}

3
controllers/chat.go
View File

@@ -18,8 +18,7 @@ func GetChatMessages(w http.ResponseWriter, r *http.Request) {
case http.MethodGet:
messages := core.GetAllChatMessages()
err := json.NewEncoder(w).Encode(messages)
if err != nil {
if err := json.NewEncoder(w).Encode(messages); err != nil {
log.Errorln(err)
}
default:

4
controllers/index.go
View File

@@ -112,9 +112,7 @@ func handleScraperMetadataPage(w http.ResponseWriter, r *http.Request) {
}
w.Header().Set("Content-Type", "text/html")
err = tmpl.Execute(w, metadata)
if err != nil {
if err := tmpl.Execute(w, metadata); err != nil {
log.Panicln(err)
}
}

16
controllers/status.go
View File

@@ -15,12 +15,12 @@ func GetStatus(w http.ResponseWriter, r *http.Request) {
status := core.GetStatus()
response := webStatusResponse{
Online: status.Online,
ViewerCount: status.ViewerCount,
LastConnectTime: status.LastConnectTime,
Online: status.Online,
ViewerCount: status.ViewerCount,
LastConnectTime: status.LastConnectTime,
LastDisconnectTime: status.LastDisconnectTime,
VersionNumber: status.VersionNumber,
StreamTitle: status.StreamTitle,
VersionNumber: status.VersionNumber,
StreamTitle: status.StreamTitle,
}
w.Header().Set("Content-Type", "application/json")
@@ -30,12 +30,12 @@ func GetStatus(w http.ResponseWriter, r *http.Request) {
}
type webStatusResponse struct {
Online bool `json:"online"`
ViewerCount int `json:"viewerCount"`
Online bool `json:"online"`
ViewerCount int `json:"viewerCount"`
LastConnectTime utils.NullTime `json:"lastConnectTime"`
LastDisconnectTime utils.NullTime `json:"lastDisconnectTime"`
VersionNumber string `json:"versionNumber"`
StreamTitle string `json:"streamTitle"`
}
}