code refactor

httpd/httpd.go

@@ -128,14 +128,14 @@ func (r *HTTPRouter) Start() func() error {
 		if flags.HTTPTLSEnable {
 			tc, err := httptls.GetServerTLSConfig(flags.HTTPTLSCertFile, flags.HTTPTLSKeyFile, flags.HTTPTLSMinVersion, flags.HTTPTLSCipherSuitesArray)
 			if err != nil {
-				logger.Fatalf("failed to get TLS config for http server: %s", err)
+				logger.Fatalf("cannot get TLS config for http server: %s", err)
 			}
 			tlsConfig = tc
 		}
 
 		listner, err := net.Listen("tcp", flags.HTTPListen)
 		if err != nil {
-			logger.Fatalf("failed to listen %q: %s", flags.HTTPListen, err)
+			logger.Fatalf("cannot listen %q: %s", flags.HTTPListen, err)
 		}
 
 		if tlsConfig != nil {
@@ -147,7 +147,7 @@ func (r *HTTPRouter) Start() func() error {
 				// The server gracefully closed.
 				return
 			}
-			logger.Fatalf("failed to serve http at %s: %s", flags.HTTPListen, err)
+			logger.Fatalf("cannot serve http at %s: %s", flags.HTTPListen, err)
 		}
 	}()
 

lib/encoding/zstd/zstd_pure.go

@@ -26,7 +26,7 @@ func init() {
 	var err error
 	decoder, err = zstd.NewReader(nil)
 	if err != nil {
-		logger.Panicf("BUG: failed to create ZSTD reader: %s", err)
+		logger.Panicf("BUG: cannot create ZSTD reader: %s", err)
 	}
 }
 
@@ -74,7 +74,7 @@ func newEncoder(compressionLevel int) *zstd.Encoder {
 		zstd.WithEncoderCRC(false), // Disable CRC for performance reasons.
 		zstd.WithEncoderLevel(level))
 	if err != nil {
-		logger.Panicf("BUG: failed to create ZSTD writer: %s", err)
+		logger.Panicf("BUG: cannot create ZSTD writer: %s", err)
 	}
 	return e
 }

lib/promauth/config.go

@@ -334,7 +334,7 @@ func (ac *Config) SetHeaders(req *http.Request, setAuthHeader bool) error {
 	if setAuthHeader {
 		ah, err := ac.GetAuthHeader()
 		if err != nil {
-			return fmt.Errorf("failed to obtain Authorization request header: %w", err)
+			return fmt.Errorf("cannot obtain Authorization request header: %w", err)
 		}
 		if ah != "" {
 			reqHeaders.Set("Authorization", ah)
@@ -352,7 +352,7 @@ func (ac *Config) SetFasthttpHeaders(req *fasthttp.Request, setAuthHeader bool)
 	if setAuthHeader {
 		ah, err := ac.GetAuthHeader()
 		if err != nil {
-			return fmt.Errorf("failed to obtain Authorization request header: %w", err)
+			return fmt.Errorf("cannot obtain Authorization request header: %w", err)
 		}
 		if ah != "" {
 			reqHeaders.Set("Authorization", ah)

lib/runner/runner.go

@@ -19,7 +19,7 @@ func PrintRuntime() {
 
 	hostname, err := os.Hostname()
 	if err != nil {
-		hostname = fmt.Sprintf("failed to get hostname: %s", err)
+		hostname = fmt.Sprintf("cannot get hostname: %s", err)
 	}
 
 	logger.Infof("hostname: %s", hostname)

main.go

@@ -9,7 +9,6 @@ import (
 	"github.com/cprobe/cprobe/httpd"
 	"github.com/cprobe/cprobe/lib/buildinfo"
 	"github.com/cprobe/cprobe/lib/envflag"
-	"github.com/cprobe/cprobe/lib/fasttime"
 	"github.com/cprobe/cprobe/lib/flagutil"
 	"github.com/cprobe/cprobe/lib/logger"
 	"github.com/cprobe/cprobe/lib/procutil"
@@ -32,29 +31,8 @@ func main() {
 
 	writer.Init()
 
-	var vs []*writer.Vector
-	vs = append(vs, &writer.Vector{
-		Labels: map[string]string{
-			"__name__": "cprobe_test02",
-			"job":      "cprobe01",
-		},
-		Clock: int64(fasttime.UnixTimestamp()) * 1000,
-		Value: 1.1,
-	})
-
-	vs = append(vs, &writer.Vector{
-		Labels: map[string]string{
-			"__name__": "cprobe_test02",
-			"job":      "cprobe02",
-		},
-		Clock: int64(fasttime.UnixTimestamp()) * 1000,
-		Value: 1.1,
-	})
-
-	writer.WriteVectors(vs)
-
 	if err := probe.Start(ctx); err != nil {
-		logger.Fatalf("failed to start probe: %v", err)
+		logger.Fatalf("cannot start probe: %v", err)
 	}
 
 	// http server
@@ -65,7 +43,7 @@ func main() {
 	sig := procutil.WaitForSigterm()
 	logger.Infof("service received signal %s", sig)
 	if err := closeHTTP(); err != nil {
-		logger.Fatalf("failed to stop the webservice: %s", err)
+		logger.Fatalf("cannot stop the webservice: %s", err)
 	}
 
 	cancel()

writer/input.go

@@ -73,13 +73,13 @@ func (w *Writer) writeVectors(vs []*Vector) {
 
 	bs, err := req.Marshal()
 	if err != nil {
-		logger.Warnf("failed to marshal WriteRequest: %s", err)
+		logger.Warnf("cannot marshal WriteRequest: %s", err)
 		return
 	}
 
 	httpReq, err := w.NewRequest(snappy.Encode(nil, bs))
 	if err != nil {
-		logger.Warnf("failed to create http request: %s", err)
+		logger.Warnf("cannot create http request: %s", err)
 		return
 	}
 

writer/writer.go

@@ -185,11 +185,11 @@ func Init() error {
 
 	err := fileutil.ReadYaml(*writerFile, WriterConfig)
 	if err != nil {
-		return errors.Wrap(err, "failed to read writer config")
+		return errors.Wrap(err, "cannot read writer config")
 	}
 
 	if err = WriterConfig.Parse(); err != nil {
-		return errors.Wrap(err, "failed to set writer fields")
+		return errors.Wrap(err, "cannot set writer fields")
 	}
 
 	return nil