Archives
/
gophi
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unnecessary CGIStatus error codes

Browse Source 
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
development
kim (grufwub) 4 years ago
parent 3a47c21aec
commit 0f73b3255d
3 changed files with 38 additions and 98 deletions
Show Stats Download Patch File Download Diff File

68
core/error.go
Unescape Escape View File

@ -5,35 +5,25 @@ type ErrorCode int
// Core ErrorCodes
const (
ConnWriteErr ErrorCode = -1
ConnReadErr ErrorCode = -2
ConnCloseErr ErrorCode = -3
ListenerResolveErr ErrorCode = -4
ListenerBeginErr ErrorCode = -5
ListenerAcceptErr ErrorCode = -6
InvalidIPErr ErrorCode = -7
InvalidPortErr ErrorCode = -8
MutexUpgradeErr ErrorCode = -9
MutexDowngradeErr ErrorCode = -10
FileOpenErr ErrorCode = -11
FileStatErr ErrorCode = -12
FileReadErr ErrorCode = -13
FileTypeErr ErrorCode = -14
DirectoryReadErr ErrorCode = -15
RestrictedPathErr ErrorCode = -16
InvalidRequestErr ErrorCode = -17
CGIStartErr ErrorCode = -18
CGIExitCodeErr ErrorCode = -19
CGIStatus400Err ErrorCode = -20
CGIStatus401Err ErrorCode = -21
CGIStatus403Err ErrorCode = -22
CGIStatus404Err ErrorCode = -23
CGIStatus408Err ErrorCode = -24
CGIStatus410Err ErrorCode = -25
CGIStatus500Err ErrorCode = -26
CGIStatus501Err ErrorCode = -27
CGIStatus503Err ErrorCode = -28
CGIStatusUnknownErr ErrorCode = -29
ConnWriteErr ErrorCode = -1
ConnReadErr ErrorCode = -2
ConnCloseErr ErrorCode = -3
ListenerResolveErr ErrorCode = -4
ListenerBeginErr ErrorCode = -5
ListenerAcceptErr ErrorCode = -6
InvalidIPErr ErrorCode = -7
InvalidPortErr ErrorCode = -8
MutexUpgradeErr ErrorCode = -9
MutexDowngradeErr ErrorCode = -10
FileOpenErr ErrorCode = -11
FileStatErr ErrorCode = -12
FileReadErr ErrorCode = -13
FileTypeErr ErrorCode = -14
DirectoryReadErr ErrorCode = -15
RestrictedPathErr ErrorCode = -16
InvalidRequestErr ErrorCode = -17
CGIStartErr ErrorCode = -18
CGIExitCodeErr ErrorCode = -19
)
// Error specifies error interface with identifiable ErrorCode
@ -86,26 +76,6 @@ func getErrorMessage(code ErrorCode) string {
return cgiStartErrStr
case CGIExitCodeErr:
return cgiExitCodeErrStr
case CGIStatus400Err:
return cgiStatus400ErrStr
case CGIStatus401Err:
return cgiStatus401ErrStr
case CGIStatus403Err:
return cgiStatus403ErrStr
case CGIStatus404Err:
return cgiStatus404ErrStr
case CGIStatus408Err:
return cgiStatus408ErrStr
case CGIStatus410Err:
return cgiStatus410ErrStr
case CGIStatus500Err:
return cgiStatus500ErrStr
case CGIStatus501Err:
return cgiStatus501ErrStr
case CGIStatus503Err:
return cgiStatus503ErrStr
case CGIStatusUnknownErr:
return cgiStatusUnknownErrStr
default:
return getExtendedErrorMessage(code)
}

48
core/string_constants.go
Unescape Escape View File

@ -124,33 +124,23 @@ const (
pgidNotFoundErrStr = "Process unfinished, PGID not found!"
pgidStopErrStr = "Error stopping process group %d: %s"
connWriteErrStr = "Conn write error"
connReadErrStr = "Conn read error"
connCloseErrStr = "Conn close error"
listenerResolveErrStr = "Listener resolve error"
listenerBeginErrStr = "Listener begin error"
listenerAcceptErrStr = "Listener accept error"
invalidIPErrStr = "Invalid IP"
invalidPortErrStr = "Invalid port"
mutexUpgradeErrStr = "Mutex upgrade fail"
mutexDowngradeErrStr = "Mutex downgrade fail"
fileOpenErrStr = "File open error"
fileStatErrStr = "File stat error"
fileReadErrStr = "File read error"
fileTypeErrStr = "Unsupported file type"
directoryReadErrStr = "Directory read error"
restrictedPathErrStr = "Restricted path"
invalidRequestErrStr = "Invalid request"
cgiStartErrStr = "CGI start error"
cgiExitCodeErrStr = "CGI non-zero exit code"
cgiStatus400ErrStr = "CGI status: 400"
cgiStatus401ErrStr = "CGI status: 401"
cgiStatus403ErrStr = "CGI status: 403"
cgiStatus404ErrStr = "CGI status: 404"
cgiStatus408ErrStr = "CGI status: 408"
cgiStatus410ErrStr = "CGI status: 410"
cgiStatus500ErrStr = "CGI status: 500"
cgiStatus501ErrStr = "CGI status: 501"
cgiStatus503ErrStr = "CGI status: 503"
cgiStatusUnknownErrStr = "CGI status: unknown"
connWriteErrStr = "Conn write error"
connReadErrStr = "Conn read error"
connCloseErrStr = "Conn close error"
listenerResolveErrStr = "Listener resolve error"
listenerBeginErrStr = "Listener begin error"
listenerAcceptErrStr = "Listener accept error"
invalidIPErrStr = "Invalid IP"
invalidPortErrStr = "Invalid port"
mutexUpgradeErrStr = "Mutex upgrade fail"
mutexDowngradeErrStr = "Mutex downgrade fail"
fileOpenErrStr = "File open error"
fileStatErrStr = "File stat error"
fileReadErrStr = "File read error"
fileTypeErrStr = "Unsupported file type"
directoryReadErrStr = "Directory read error"
restrictedPathErrStr = "Restricted path"
invalidRequestErrStr = "Invalid request"
cgiStartErrStr = "CGI start error"
cgiExitCodeErrStr = "CGI non-zero exit code"
)

20
gopher/error.go
Unescape Escape View File

@ -64,26 +64,6 @@ func generateErrorResponse(code core.ErrorCode) ([]byte, bool) {
return buildErrorLine(errorResponse500), true
case core.CGIExitCodeErr:
return buildErrorLine(errorResponse500), true
case core.CGIStatus400Err:
return buildErrorLine(errorResponse400), true
case core.CGIStatus401Err:
return buildErrorLine(errorResponse401), true
case core.CGIStatus403Err:
return buildErrorLine(errorResponse403), true
case core.CGIStatus404Err:
return buildErrorLine(errorResponse404), true
case core.CGIStatus408Err:
return buildErrorLine(errorResponse408), true
case core.CGIStatus410Err:
return buildErrorLine(errorResponse410), true
case core.CGIStatus500Err:
return buildErrorLine(errorResponse500), true
case core.CGIStatus501Err:
return buildErrorLine(errorResponse501), true
case core.CGIStatus503Err:
return buildErrorLine(errorResponse503), true
case core.CGIStatusUnknownErr:
return buildErrorLine(errorResponse500), true
case InvalidGophermapErr:
return buildErrorLine(errorResponse500), true
case SubgophermapIsDirErr:

Write Preview
Loading…
Cancel
Save