mirror of
https://github.com/nabbar/golib.git
synced 2025-10-05 15:56:50 +08:00
Refactor package errors + packages names :
- Refactor ErrorType, list errors managment, codeError - Add interface Error with error interface implement - Add type CodeError assign typiclly to const that represent code of error - Add func to registry func to retrieve message from an uint16 codeError (typicaly a switch of each codeError const) - Add default errorCode with default errorMessage if no one code or message is found - Add modeError to manage how to manage compatibility between Error interface and error interface - Add Error interface that allow parent link (parent as error or Error interface), code and trace management - Add trace finder to allow find func/file/line caller when Error is call - Add http 2 transport in httpcli - Add http 2 transport in httpserver - Add function to get client http with timeout management in httpcli - Add function to get Error if occurs of http client in httpcli - Add test for smtp package - Chg return error by returning Error in all packages - Chg package njs-archive by archive - Chg package njs-certif by certificates - Chg package njs-console by console - Chg package njs-crypt by crypt - Chg package njs-errors by errors - Chg package njs-httpcli by httpcli - Chg package njs-httpserver by httpserver - Chg package njs-ioutils by ioutils - Chg package njs-ldap by ldap - Chg package njs-logger by logger - Chg package njs-password by password - Chg package njs-progress by progress - Chg package njs-router by router - Chg package njs-semaphore by semaphore - Chg package njs-smtp by smtp - Chg package njs-static by static - Chg package njs-status by status - Chg package njs-version by version - Fix dependancies gopkg by github/go-ldap for go module compatibility - Fix gin Abort call by gin Abort with Error in static package - Fix issue #18 in status package : replace partner by component - Fix go vet error - Del deprecated function - Del useless function & files - Bump dependancies - Apply CHG in README.md
This commit is contained in:
Nicolas JUHEL
0
httpserver/README.md
Normal file
0
httpserver/README.md
Normal file
46
httpserver/error.go
Normal file
46
httpserver/error.go
Normal file
@@ -0,0 +1,46 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020 Nicolas JUHEL
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
package httpserver
|
||||
|
||||
import errors "github.com/nabbar/golib/errors"
|
||||
|
||||
const (
|
||||
EMPTY_PARAMS errors.CodeError = iota + errors.MIN_PKG_Httpserver
|
||||
)
|
||||
|
||||
func init() {
|
||||
errors.RegisterFctMessage(getMessage)
|
||||
}
|
||||
|
||||
func getMessage(code errors.CodeError) (message string) {
|
||||
switch code {
|
||||
case EMPTY_PARAMS:
|
||||
return "given parameters is empty"
|
||||
}
|
||||
|
||||
return ""
|
||||
}
|
||||
258
httpserver/http.go
Normal file
258
httpserver/http.go
Normal file
@@ -0,0 +1,258 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2019 Nicolas JUHEL
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
package httpserver
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"fmt"
|
||||
"log"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strconv"
|
||||
"sync"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"golang.org/x/net/http2"
|
||||
|
||||
njs_certif "github.com/nabbar/golib/certificates"
|
||||
|
||||
. "github.com/nabbar/golib/logger"
|
||||
)
|
||||
|
||||
const (
|
||||
TIMEOUT_30_SEC = 30 * time.Second
|
||||
TIMEOUT_10_SEC = 10 * time.Second
|
||||
TIMEOUT_5_SEC = 5 * time.Second
|
||||
TIMEOUT_1_SEC = 1 * time.Second
|
||||
)
|
||||
|
||||
type modelServer struct {
|
||||
ssl *tls.Config
|
||||
srv *http.Server
|
||||
hdl http.Handler
|
||||
addr *url.URL
|
||||
host string
|
||||
port int
|
||||
}
|
||||
|
||||
type HTTPServer interface {
|
||||
GetBindable() string
|
||||
GetExpose() string
|
||||
IsRunning() bool
|
||||
|
||||
Listen()
|
||||
Restart()
|
||||
Shutdown()
|
||||
|
||||
WaitNotify()
|
||||
}
|
||||
|
||||
func NewServer(listen, expose string, handler http.Handler, tlsConfig *tls.Config) HTTPServer {
|
||||
srv := &modelServer{
|
||||
hdl: handler,
|
||||
ssl: tlsConfig,
|
||||
}
|
||||
|
||||
if host, prt, err := net.SplitHostPort(listen); err != nil {
|
||||
srv.host = listen
|
||||
srv.port = 0
|
||||
} else if port, err := strconv.Atoi(prt); err != nil {
|
||||
srv.host = host
|
||||
srv.port = 0
|
||||
} else {
|
||||
srv.host = host
|
||||
srv.port = port
|
||||
}
|
||||
|
||||
if expose == "" {
|
||||
expose = listen
|
||||
}
|
||||
|
||||
if uri, err := url.Parse(expose); err == nil {
|
||||
srv.addr = uri
|
||||
} else if uri, err = url.Parse(listen); err == nil {
|
||||
srv.addr = uri
|
||||
} else {
|
||||
srv.addr = &url.URL{
|
||||
Host: expose,
|
||||
}
|
||||
}
|
||||
|
||||
if srv.addr.Scheme == "" {
|
||||
if srv.ssl != nil {
|
||||
srv.addr.Scheme = "https"
|
||||
} else {
|
||||
srv.addr.Scheme = "http"
|
||||
}
|
||||
} else if srv.addr.Scheme == "http" {
|
||||
srv.ssl = nil
|
||||
}
|
||||
|
||||
return srv
|
||||
}
|
||||
|
||||
func ListenWaitNotify(allSrv ...HTTPServer) {
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(len(allSrv))
|
||||
|
||||
for _, s := range allSrv {
|
||||
go func(serv HTTPServer) {
|
||||
defer wg.Done()
|
||||
serv.Listen()
|
||||
serv.WaitNotify()
|
||||
}(s)
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
func Listen(allSrv ...HTTPServer) {
|
||||
for _, s := range allSrv {
|
||||
go func(serv HTTPServer) {
|
||||
serv.Listen()
|
||||
}(s)
|
||||
}
|
||||
}
|
||||
|
||||
func Restart(allSrv ...HTTPServer) {
|
||||
for _, s := range allSrv {
|
||||
s.Restart()
|
||||
}
|
||||
}
|
||||
|
||||
func Shutdown(allSrv ...HTTPServer) {
|
||||
for _, s := range allSrv {
|
||||
s.Shutdown()
|
||||
}
|
||||
}
|
||||
|
||||
func IsRunning(allSrv ...HTTPServer) bool {
|
||||
for _, s := range allSrv {
|
||||
if s.IsRunning() {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func (srv modelServer) GetBindable() string {
|
||||
return fmt.Sprintf("%s:%d", srv.host, srv.port)
|
||||
}
|
||||
|
||||
func (srv modelServer) GetExpose() string {
|
||||
return srv.addr.String()
|
||||
}
|
||||
|
||||
func (srv *modelServer) Listen() {
|
||||
if srv.srv != nil {
|
||||
srv.Shutdown()
|
||||
}
|
||||
|
||||
srv.srv = &http.Server{
|
||||
Addr: srv.GetBindable(),
|
||||
ErrorLog: GetLogger(ErrorLevel, log.LstdFlags|log.Lmicroseconds, "[http/http2 server '%s']", srv.GetBindable()),
|
||||
Handler: srv.hdl,
|
||||
TLSConfig: srv.ssl,
|
||||
}
|
||||
|
||||
cnf := &http2.Server{
|
||||
//MaxHandlers: 0,
|
||||
//MaxConcurrentStreams: 0,
|
||||
//MaxReadFrameSize: 0,
|
||||
//PermitProhibitedCipherSuites: false,
|
||||
IdleTimeout: TIMEOUT_30_SEC,
|
||||
//MaxUploadBufferPerConnection: 0,
|
||||
//MaxUploadBufferPerStream: 0,
|
||||
//NewWriteScheduler: nil,
|
||||
}
|
||||
|
||||
err := http2.ConfigureServer(srv.srv, cnf)
|
||||
FatalLevel.Logf("Configuring Server '%s' Error: %v", srv.host, err)
|
||||
|
||||
go func() {
|
||||
if srv.ssl == nil || !njs_certif.CheckCertificates() {
|
||||
InfoLevel.Logf("Server '%s' is starting with bindable: %s", srv.host, srv.GetBindable())
|
||||
if err := srv.srv.ListenAndServe(); err != nil {
|
||||
FatalLevel.Logf("Listen Server '%s' Error: %v", srv.host, err)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
InfoLevel.Logf("TLS Server '%s' is starting with bindable: %s", srv.host, srv.GetBindable())
|
||||
if err := srv.srv.ListenAndServeTLS("", ""); err != nil {
|
||||
FatalLevel.Logf("Listen TLS Server '%s' Error: %v", srv.host, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func (srv *modelServer) WaitNotify() {
|
||||
// Wait for interrupt signal to gracefully shutdown the server with
|
||||
// a timeout of 5 seconds.
|
||||
quit := make(chan os.Signal, 1)
|
||||
signal.Notify(quit, syscall.SIGINT)
|
||||
signal.Notify(quit, syscall.SIGTERM)
|
||||
//signal.Notify(quit, syscall.SIGKILL)
|
||||
signal.Notify(quit, syscall.SIGQUIT)
|
||||
|
||||
<-quit
|
||||
srv.Shutdown()
|
||||
}
|
||||
|
||||
func (srv *modelServer) Restart() {
|
||||
if srv.srv != nil {
|
||||
srv.Shutdown()
|
||||
}
|
||||
|
||||
srv.Listen()
|
||||
}
|
||||
|
||||
func (srv *modelServer) Shutdown() {
|
||||
InfoLevel.Logf("Shutdown Server '%s'...", srv.addr.Host)
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer cancel()
|
||||
|
||||
if srv.srv == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if err := srv.srv.Shutdown(ctx); err != nil {
|
||||
FatalLevel.Logf("Shutdown Server '%s' Error: %v", srv.host, err)
|
||||
}
|
||||
|
||||
srv.srv = nil
|
||||
}
|
||||
|
||||
func (srv *modelServer) IsRunning() bool {
|
||||
return srv.srv != nil
|
||||
}
|
||||
Reference in New Issue
Block a user