balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Code formatting and cleanup (#442)

Browse Source 
* Formatting, extract error messages
* More refactor
* Move errors to a separate file
* Add missing file
* Misc
This commit is contained in:
Dan Sosedoff
2019-09-29 12:16:42 -05:00
committed by GitHub
parent c4db1973c4
commit 7a6450091a
6 changed files with 109 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/middleware.go
View File

@@ -23,7 +23,7 @@ func dbCheckMiddleware() gin.HandlerFunc {
// Check if session exists in single-session mode
if !command.Opts.Sessions {
if DbClient == nil {
badRequest(c, "Not connected")
badRequest(c, errNotConnected)
return
}
@@ -32,16 +32,16 @@ func dbCheckMiddleware() gin.HandlerFunc {
}
// Determine session ID from the client request
sessionId := getSessionId(c.Request)
if sessionId == "" {
badRequest(c, "Session ID is required")
sid := getSessionId(c.Request)
if sid == "" {
badRequest(c, errSessionRequired)
return
}
// Determine the database connection handle for the session
conn := DbSessions[sessionId]
conn := DbSessions[sid]
if conn == nil {
badRequest(c, "Not connected")
badRequest(c, errNotConnected)
return
}