Commit c4e4a5a0 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Clean up minor go vet issues.

parent cfc091e3

main.go

+2 −1
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ func dbConnect(multiLogger *zap.Logger, config server.Config) (*sql.DB, string) 
		multiLogger.Fatal("Error connecting to database", zap.Error(err))

	}

	// Limit the time allowed to ping database and get version to 15 seconds total.

	ctx, _ := context.WithTimeout(context.Background(), 15*time.Second)

	ctx, ctxCancelFn := context.WithTimeout(context.Background(), 15*time.Second)

	defer ctxCancelFn()

	if err = db.PingContext(ctx); err != nil {

		if strings.HasSuffix(err.Error(), "does not exist (SQLSTATE 3D000)") {

			multiLogger.Fatal("Database schema not found, run `nakama migrate up`", zap.Error(err))

server/api_test.go

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ func NewAPIServer(t *testing.T, runtime *Runtime) (*ApiServer, *Pipeline) { 
	db := NewDB(t)

	router := &DummyMessageRouter{}

	tracker := &LocalTracker{}

	pipeline := NewPipeline(logger, cfg, db, jsonpbMarshaler, jsonpbUnmarshaler, nil, nil, nil, tracker, router, runtime)

	pipeline := NewPipeline(logger, cfg, db, jsonpbMarshaler, jsonpbUnmarshaler, nil, nil, nil, nil, tracker, router, runtime)

	apiServer := StartApiServer(logger, logger, db, jsonpbMarshaler, jsonpbUnmarshaler, cfg, nil, nil, nil, nil, nil, nil, tracker, router, metrics, pipeline, runtime)

	return apiServer, pipeline

}

server/console_authenticate.go

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import ( 
	"google.golang.org/grpc/codes"

	"google.golang.org/grpc/status"



	jwt "github.com/dgrijalva/jwt-go"

	"github.com/dgrijalva/jwt-go"

	"github.com/heroiclabs/nakama/v3/console"

)
@@ -38,7 +38,7 @@ type ConsoleTokenClaims struct { 
	Email     string           `json:"ema,omitempty"`

	Role      console.UserRole `json:"rol,omitempty"`

	ExpiresAt int64            `json:"exp,omitempty"`

	Cookie    string           `json:"cki,omitempty""`

	Cookie    string           `json:"cki,omitempty"`

}



func (stc *ConsoleTokenClaims) Valid() error {

server/runtime_lua_match_core.go

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ func NewRuntimeLuaMatchCore(logger *zap.Logger, module string, db *sql.DB, jsonp 
		if apiErr, ok := err.(*lua.ApiError); ok {

			if strings.Contains(apiErr.Error(), fmt.Sprintf("module %s not found", name)) {

				// Module not found

				ctxCancelFn()

				return nil, nil

			}

		}

server/runtime_test.go

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ nakama.register_rpc(test.printWorld, "helloworld")`, 
	}



	db := NewDB(t)

	pipeline := NewPipeline(logger, cfg, db, jsonpbMarshaler, jsonpbUnmarshaler, nil, nil, nil, nil, nil, runtime)

	pipeline := NewPipeline(logger, cfg, db, jsonpbMarshaler, jsonpbUnmarshaler, nil, nil, nil, nil, nil, nil, runtime)

	apiServer := StartApiServer(logger, logger, db, jsonpbMarshaler, jsonpbUnmarshaler, cfg, nil, nil, nil, nil, nil, nil, nil, nil, metrics, pipeline, runtime)

	defer apiServer.Stop()