Skip to content

Commit ffea10b

Browse files
Merge branch 'getgauge:master' into master
2 parents 4e710d1 + f7a8fd5 commit ffea10b

33 files changed

+802
-427
lines changed

api/api.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ func RunInBackground(apiPort string, specDirs []string) {
122122
if apiPort != "" {
123123
port, err = strconv.Atoi(apiPort)
124124
if err != nil {
125-
logger.Fatalf(true, fmt.Sprintf("Invalid port number: %s", apiPort))
125+
logger.Fatalf(true, "Invalid port number: %s", apiPort)
126126
}
127127
os.Setenv(common.APIPortEnvVariableName, apiPort)
128128
} else {
129129
port, err = conn.GetPortFromEnvironmentVariable(common.APIPortEnvVariableName)
130130
if err != nil {
131-
logger.Fatalf(true, fmt.Sprintf("Failed to start API Service. %s \n", err.Error()))
131+
logger.Fatalf(true, "Failed to start API Service. %s \n", err.Error())
132132
}
133133
}
134134
runAPIServiceIndefinitely(port, specDirs)
@@ -140,18 +140,18 @@ func Start(specsDir []string) *conn.GaugeConnectionHandler {
140140
apiHandler := &gaugeAPIMessageHandler{specInfoGatherer: sig}
141141
gaugeConnectionHandler, err := conn.NewGaugeConnectionHandler(0, apiHandler)
142142
if err != nil {
143-
logger.Fatalf(true, err.Error())
143+
logger.Fatal(true, err.Error())
144144
}
145145
errChan := make(chan error)
146146
go func() {
147147
_, err := gaugeConnectionHandler.AcceptConnection(config.RunnerConnectionTimeout(), errChan)
148148
if err != nil {
149-
logger.Fatalf(true, err.Error())
149+
logger.Fatal(true, err.Error())
150150
}
151151
}()
152152
go func() {
153153
e := <-errChan
154-
logger.Fatalf(true, e.Error())
154+
logger.Fatal(true, e.Error())
155155
}()
156156
return gaugeConnectionHandler
157157
}

api/lang/logger.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type lspWriter struct {
2020
}
2121

2222
func (w lspWriter) Write(p []byte) (n int, err error) {
23-
logger.Debugf(false, string(p))
23+
logger.Debug(false, string(p))
2424
return os.Stderr.Write(p)
2525
}
2626

@@ -61,25 +61,25 @@ func initialize(ctx context.Context, conn *jsonrpc2.Conn) {
6161

6262
func logDebug(req *jsonrpc2.Request, msg string, args ...interface{}) {
6363
m := fmt.Sprintf(getLogFormatFor(req, msg), args...)
64-
logger.Debugf(false, m)
64+
logger.Debug(false, m)
6565
logToLsp(lsp.Log, m)
6666
}
6767

6868
func logInfo(req *jsonrpc2.Request, msg string, args ...interface{}) {
6969
m := fmt.Sprintf(getLogFormatFor(req, msg), args...)
70-
logger.Infof(false, m)
70+
logger.Info(false, m)
7171
logToLsp(lsp.Info, m)
7272
}
7373

7474
func logWarning(req *jsonrpc2.Request, msg string, args ...interface{}) {
7575
m := fmt.Sprintf(getLogFormatFor(req, msg), args...)
76-
logger.Warningf(false, m)
76+
logger.Warning(false, m)
7777
logToLsp(lsp.MTWarning, m)
7878
}
7979

8080
func logError(req *jsonrpc2.Request, msg string, args ...interface{}) {
8181
m := fmt.Sprintf(getLogFormatFor(req, msg), args...)
82-
logger.Errorf(false, m)
82+
logger.Error(false, m)
8383
logToLsp(lsp.MTError, m)
8484
}
8585

0 commit comments

Comments
 (0)