LogalDeveloper/owncast
0
Fork 0
Code Activity

Start cleaning up linter errors. (#358)

Browse Source 
* Start cleaning up linter errors. For #357

* Fix unmarshalling NullTime values

* More linter fixes

* Remove commented code

* Move defer up

* Consolidate error check lines

* Move error check to make sure row iteration was successful

* Cleaner error check + do not recreate pipe if it exists

* Consolidate hashing to generate client id
This commit is contained in:
Gabe Kangas
2020-11-14 18:39:53 -08:00
committed by GitHub
parent c76b7229a5
commit 4d2066a76d
34 changed files with 248 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/admin/hardware.go
View File

@@ -5,6 +5,7 @@ import (
"net/http"
"github.com/owncast/owncast/metrics"
log "github.com/sirupsen/logrus"
)
// GetHardwareStats will return hardware utilization over time.
@@ -12,5 +13,8 @@ func GetHardwareStats(w http.ResponseWriter, r *http.Request) {
m := metrics.Metrics
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(m)
err := json.NewEncoder(w).Encode(m)
if err != nil {
log.Errorln(err)
}
}

8
controllers/admin/index.go
View File

@@ -27,7 +27,7 @@ func ServeAdmin(w http.ResponseWriter, r *http.Request) {
f, err := pkger.Open(path)
if err != nil {
log.Warnln(err, path)
errorHandler(w, r, http.StatusNotFound)
errorHandler(w, http.StatusNotFound)
return
}
@@ -39,9 +39,11 @@ func ServeAdmin(w http.ResponseWriter, r *http.Request) {
mimeType := mime.TypeByExtension(filepath.Ext(path))
w.Header().Set("Content-Type", mimeType)
w.Write(b)
if _, err = w.Write(b); err != nil {
log.Errorln(err)
}
}
func errorHandler(w http.ResponseWriter, r *http.Request, status int) {
func errorHandler(w http.ResponseWriter, status int) {
w.WriteHeader(status)
}

11
controllers/admin/logs.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/owncast/owncast/logging"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
// GetLogs will return all logs.
@@ -19,7 +20,10 @@ func GetLogs(w http.ResponseWriter, r *http.Request) {
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(response)
err := json.NewEncoder(w).Encode(response)
if err != nil {
log.Errorln(err)
}
}
// GetWarnings will return only warning and error logs.
@@ -32,7 +36,10 @@ func GetWarnings(w http.ResponseWriter, r *http.Request) {
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(response)
err := json.NewEncoder(w).Encode(response)
if err != nil {
log.Errorln(err)
}
}
type logsResponse struct {

6
controllers/admin/serverConfig.go
View File

@@ -5,6 +5,7 @@ import (
"net/http"
"github.com/owncast/owncast/config"
log "github.com/sirupsen/logrus"
)
// GetServerConfig gets the config details of the server.
@@ -35,7 +36,10 @@ func GetServerConfig(w http.ResponseWriter, r *http.Request) {
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(response)
err := json.NewEncoder(w).Encode(response)
if err != nil {
log.Errorln(err)
}
}
type serverConfigAdminResponse struct {

6
controllers/admin/status.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/models"
log "github.com/sirupsen/logrus"
)
// Status gets the details of the inbound broadcaster.
@@ -25,7 +26,10 @@ func Status(w http.ResponseWriter, r *http.Request) {
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(response)
err := json.NewEncoder(w).Encode(response)
if err != nil {
log.Errorln(err)
}
}
type adminStatusResponse struct {

6
controllers/admin/viewers.go
View File

@@ -5,11 +5,15 @@ import (
"net/http"
"github.com/owncast/owncast/metrics"
log "github.com/sirupsen/logrus"
)
// GetViewersOverTime will return the number of viewers at points in time.
func GetViewersOverTime(w http.ResponseWriter, r *http.Request) {
viewersOverTime := metrics.Metrics.Viewers
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(viewersOverTime)
err := json.NewEncoder(w).Encode(viewersOverTime)
if err != nil {
log.Errorln(err)
}
}

15
controllers/chat.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/models"
"github.com/owncast/owncast/router/middleware"
log "github.com/sirupsen/logrus"
)
// GetChatMessages gets all of the chat messages.
@@ -17,7 +18,10 @@ func GetChatMessages(w http.ResponseWriter, r *http.Request) {
case http.MethodGet:
messages := core.GetAllChatMessages()
json.NewEncoder(w).Encode(messages)
err := json.NewEncoder(w).Encode(messages)
if err != nil {
log.Errorln(err)
}
case http.MethodPost:
var message models.ChatMessage
if err := json.NewDecoder(r.Body).Decode(&message); err != nil {
@@ -30,9 +34,14 @@ func GetChatMessages(w http.ResponseWriter, r *http.Request) {
return
}
json.NewEncoder(w).Encode(j{"success": true})
if err := json.NewEncoder(w).Encode(j{"success": true}); err != nil {
internalErrorHandler(w, err)
return
}
default:
w.WriteHeader(http.StatusNotImplemented)
json.NewEncoder(w).Encode(j{"error": "method not implemented (PRs are accepted)"})
if err := json.NewEncoder(w).Encode(j{"error": "method not implemented (PRs are accepted)"}); err != nil {
internalErrorHandler(w, err)
}
}
}

4
controllers/config.go
View File

@@ -14,5 +14,7 @@ func GetWebConfig(w http.ResponseWriter, r *http.Request) {
configuration := config.Config.InstanceDetails
configuration.Version = config.Config.VersionInfo
json.NewEncoder(w).Encode(configuration)
if err := json.NewEncoder(w).Encode(configuration); err != nil {
badRequestHandler(w, err)
}
}

4
controllers/connectedClients.go
View File

@@ -12,5 +12,7 @@ func GetConnectedClients(w http.ResponseWriter, r *http.Request) {
clients := core.GetClients()
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(clients)
if err := json.NewEncoder(w).Encode(clients); err != nil {
internalErrorHandler(w, err)
}
}

12
controllers/controllers.go
View File

@@ -15,7 +15,9 @@ func internalErrorHandler(w http.ResponseWriter, err error) {
}
w.WriteHeader(http.StatusInternalServerError)
json.NewEncoder(w).Encode(j{"error": err.Error()})
if err := json.NewEncoder(w).Encode(j{"error": err.Error()}); err != nil {
internalErrorHandler(w, err)
}
}
func badRequestHandler(w http.ResponseWriter, err error) {
@@ -24,7 +26,9 @@ func badRequestHandler(w http.ResponseWriter, err error) {
}
w.WriteHeader(http.StatusBadRequest)
json.NewEncoder(w).Encode(j{"error": err.Error()})
if err := json.NewEncoder(w).Encode(j{"error": err.Error()}); err != nil {
internalErrorHandler(w, err)
}
}
func WriteSimpleResponse(w http.ResponseWriter, success bool, message string) {
@@ -33,5 +37,7 @@ func WriteSimpleResponse(w http.ResponseWriter, success bool, message string) {
Message: message,
}
w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(response)
if err := json.NewEncoder(w).Encode(response); err != nil {
internalErrorHandler(w, err)
}
}

6
controllers/emoji.go
View File

@@ -35,9 +35,11 @@ func GetCustomEmoji(w http.ResponseWriter, r *http.Request) {
for _, f := range files {
name := strings.TrimSuffix(f.Name(), path.Ext(f.Name()))
emojiPath := filepath.Join(emojiDir, f.Name())
singleEmoji := models.CustomEmoji{name, emojiPath}
singleEmoji := models.CustomEmoji{Name: name, Emoji: emojiPath}
emojiList = append(emojiList, singleEmoji)
}
json.NewEncoder(w).Encode(emojiList)
if err := json.NewEncoder(w).Encode(emojiList); err != nil {
internalErrorHandler(w, err)
}
}

4
controllers/status.go
View File

@@ -15,5 +15,7 @@ func GetStatus(w http.ResponseWriter, r *http.Request) {
status := core.GetStatus()
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(status)
if err := json.NewEncoder(w).Encode(status); err != nil {
internalErrorHandler(w, err)
}
}