Unverified Commit 8a46f284 authored by Simon Esposito's avatar Simon Esposito Committed by GitHub
Browse files

Fix some lint warnings (#376) 

* Fix lint warnings

Fix warnings related to variable names, unnecessary nil var initialisation, unnecessary
else blocks after return statements and unary variable {inc|dec}rements.

* gofmt -s fixes
parent 3f6a294f

cronexpr/cronexpr.go

+6 −6
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ func Parse(cronLine string) (*Expression, error) { 
		if err != nil {

			return nil, err

		}

		field += 1

		field++

	} else {

		expr.secondList = []int{0}

	}
@@ -100,35 +100,35 @@ func Parse(cronLine string) (*Expression, error) { 
	if err != nil {

		return nil, err

	}

	field += 1

	field++



	// hour field

	err = expr.hourFieldHandler(cron[indices[field][0]:indices[field][1]])

	if err != nil {

		return nil, err

	}

	field += 1

	field++



	// day of month field

	err = expr.domFieldHandler(cron[indices[field][0]:indices[field][1]])

	if err != nil {

		return nil, err

	}

	field += 1

	field++



	// month field

	err = expr.monthFieldHandler(cron[indices[field][0]:indices[field][1]])

	if err != nil {

		return nil, err

	}

	field += 1

	field++



	// day of week field

	err = expr.dowFieldHandler(cron[indices[field][0]:indices[field][1]])

	if err != nil {

		return nil, err

	}

	field += 1

	field++



	// year field

	if field < fieldCount {

cronexpr/cronexpr_next.go

+2 −2
Original line number Diff line number Diff line
@@ -277,13 +277,13 @@ func workdayOfMonth(targetDom, lastDom time.Time) int { 
	dow := targetDom.Weekday()

	if dow == time.Saturday {

		if dom > 1 {

			dom -= 1

			dom--

		} else {

			dom += 2

		}

	} else if dow == time.Sunday {

		if dom < lastDom.Day() {

			dom += 1

			dom++

		} else {

			dom -= 2

		}

cronexpr/cronexpr_parse.go

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ func toList(set map[int]bool) []int { 
	i := 0

	for k := range set {

		list[i] = k

		i += 1

		i++

	}

	sort.Ints(list)

	return list

main.go

+10 −10
Original line number Diff line number Diff line
@@ -211,26 +211,26 @@ func main() { 
}



func dbConnect(multiLogger *zap.Logger, config server.Config) (*sql.DB, string) {

	rawUrl := fmt.Sprintf("postgresql://%s", config.GetDatabase().Addresses[0])

	parsedUrl, err := url.Parse(rawUrl)

	rawURL := fmt.Sprintf("postgresql://%s", config.GetDatabase().Addresses[0])

	parsedURL, err := url.Parse(rawURL)

	if err != nil {

		multiLogger.Fatal("Bad database connection URL", zap.Error(err))

	}

	query := parsedUrl.Query()

	query := parsedURL.Query()

	if len(query.Get("sslmode")) == 0 {

		query.Set("sslmode", "disable")

		parsedUrl.RawQuery = query.Encode()

		parsedURL.RawQuery = query.Encode()

	}



	if len(parsedUrl.User.Username()) < 1 {

		parsedUrl.User = url.User("root")

	if len(parsedURL.User.Username()) < 1 {

		parsedURL.User = url.User("root")

	}

	if len(parsedUrl.Path) < 1 {

		parsedUrl.Path = "/nakama"

	if len(parsedURL.Path) < 1 {

		parsedURL.Path = "/nakama"

	}



	multiLogger.Debug("Complete database connection URL", zap.String("raw_url", parsedUrl.String()))

	db, err := sql.Open("pgx", parsedUrl.String())

	multiLogger.Debug("Complete database connection URL", zap.String("raw_url", parsedURL.String()))

	db, err := sql.Open("pgx", parsedURL.String())

	if err != nil {

		multiLogger.Fatal("Error connecting to database", zap.Error(err))

	}

migrate/migrate.go

+13 −13
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import ( 
	"github.com/gobuffalo/packr"

	"github.com/heroiclabs/nakama/v2/server"

	"github.com/jackc/pgx"

	_ "github.com/jackc/pgx/stdlib"

	_ "github.com/jackc/pgx/stdlib" // Blank import to register SQL driver

	"github.com/rubenv/sql-migrate"

	"go.uber.org/zap"

	"go.uber.org/zap/zapcore"
@@ -117,29 +117,29 @@ func Parse(args []string, tmpLogger *zap.Logger) { 
	ms.parseSubcommand(args[1:], tmpLogger)

	logger := server.NewJSONLogger(os.Stdout, zapcore.InfoLevel, ms.loggerFormat)



	rawUrl := fmt.Sprintf("postgresql://%s", ms.dbAddress)

	parsedUrl, err := url.Parse(rawUrl)

	rawURL := fmt.Sprintf("postgresql://%s", ms.dbAddress)

	parsedURL, err := url.Parse(rawURL)

	if err != nil {

		logger.Fatal("Bad connection URL", zap.Error(err))

	}

	query := parsedUrl.Query()

	query := parsedURL.Query()

	if len(query.Get("sslmode")) == 0 {

		query.Set("sslmode", "disable")

		parsedUrl.RawQuery = query.Encode()

		parsedURL.RawQuery = query.Encode()

	}



	if len(parsedUrl.User.Username()) < 1 {

		parsedUrl.User = url.User("root")

	if len(parsedURL.User.Username()) < 1 {

		parsedURL.User = url.User("root")

	}

	dbname := "nakama"

	if len(parsedUrl.Path) > 1 {

		dbname = parsedUrl.Path[1:]

	if len(parsedURL.Path) > 1 {

		dbname = parsedURL.Path[1:]

	}



	logger.Info("Database connection", zap.String("dsn", ms.dbAddress))



	parsedUrl.Path = ""

	db, err := sql.Open("pgx", parsedUrl.String())

	parsedURL.Path = ""

	db, err := sql.Open("pgx", parsedURL.String())

	if err != nil {

		logger.Fatal("Failed to open database", zap.Error(err))

	}
@@ -165,8 +165,8 @@ func Parse(args []string, tmpLogger *zap.Logger) { 
	_ = db.Close()



	// Append dbname to data source name.

	parsedUrl.Path = fmt.Sprintf("/%s", dbname)

	db, err = sql.Open("pgx", parsedUrl.String())

	parsedURL.Path = fmt.Sprintf("/%s", dbname)

	db, err = sql.Open("pgx", parsedURL.String())

	if err != nil {

		logger.Fatal("Failed to open database", zap.Error(err))

	}