Linting.
This commit is contained in:
parent
f5b1f9d9f9
commit
61d34f3687
@ -5,6 +5,8 @@ linters:
|
||||
disable:
|
||||
# Actually not really needed.
|
||||
- gochecknoglobals
|
||||
# Well, it might help, but not so much.
|
||||
- funlen
|
||||
linters-settings:
|
||||
lll:
|
||||
line-length: 420
|
||||
|
@ -30,7 +30,9 @@ func main() {
|
||||
// CTRL+C handler.
|
||||
signalHandler := make(chan os.Signal, 1)
|
||||
shutdownDone := make(chan bool, 1)
|
||||
|
||||
signal.Notify(signalHandler, os.Interrupt, syscall.SIGTERM)
|
||||
|
||||
go func() {
|
||||
<-signalHandler
|
||||
log.Println("CTRL+C or SIGTERM received, shutting down gonewsd...")
|
||||
|
@ -46,5 +46,6 @@ func addCapability(data interface{}) interface{} {
|
||||
func handler(data interface{}) interface{} {
|
||||
caps := make([]string, len(capabilities))
|
||||
copy(caps, capabilities)
|
||||
|
||||
return caps
|
||||
}
|
||||
|
@ -34,6 +34,7 @@ func Initialize() {
|
||||
|
||||
pathRaw = strings.Replace(pathRaw, "~", userHomeDir, 1)
|
||||
}
|
||||
|
||||
absPath, err1 := filepath.Abs(pathRaw)
|
||||
if err1 != nil {
|
||||
log.Fatalln("Failed to get absolute path for configuration file: " + err1.Error())
|
||||
@ -46,6 +47,7 @@ func Initialize() {
|
||||
}
|
||||
|
||||
Cfg = &config{}
|
||||
|
||||
err3 := yaml.Unmarshal(fileData, Cfg)
|
||||
if err3 != nil {
|
||||
log.Fatalln("Failed to parse configuration file: " + err3.Error())
|
||||
|
@ -47,6 +47,7 @@ func startConnectionWatcher() {
|
||||
|
||||
ticker.Stop()
|
||||
log.Println("Connection watcher stopped and connection to database was shutted down")
|
||||
|
||||
connWatcherStopped = true
|
||||
}
|
||||
|
||||
@ -56,11 +57,14 @@ func watcher() bool {
|
||||
// If we're shutting down - stop connection watcher.
|
||||
if weAreShuttingDown {
|
||||
log.Println("Closing database connection...")
|
||||
|
||||
err := Conn.Close()
|
||||
if err != nil {
|
||||
log.Println("Failed to close database connection")
|
||||
}
|
||||
|
||||
Conn = nil
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
|
@ -14,7 +14,7 @@ var (
|
||||
Conn *sqlx.DB
|
||||
|
||||
// Shutdown flags.
|
||||
// Sets to true when Shutdown() is called to indicate other subsystes
|
||||
// Sets to true when Shutdown() is called to indicate other subsystems
|
||||
// that we're shutting down.
|
||||
weAreShuttingDown bool
|
||||
// Sets to true when connection watcher will be stopped.
|
||||
@ -35,6 +35,7 @@ func Initialize() {
|
||||
|
||||
func Shutdown() {
|
||||
weAreShuttingDown = true
|
||||
|
||||
for {
|
||||
if connWatcherStopped {
|
||||
break
|
||||
|
@ -11,21 +11,23 @@ import (
|
||||
"github.com/pressly/goose"
|
||||
)
|
||||
|
||||
// Initialize initializes database migrations. This is the function
|
||||
// where migrations should be registered.
|
||||
func Initialize() {
|
||||
log.Println("Initializing database migrations...")
|
||||
|
||||
_ = goose.SetDialect("postgres")
|
||||
|
||||
goose.AddNamedMigration("1_create_users_table.go", CreateUsersTableUp, CreateUsersTableDown)
|
||||
|
||||
// Migrations should be registered here.
|
||||
}
|
||||
|
||||
// Migrate parses environment for necessary parameters and starts
|
||||
// database migration process.
|
||||
func Migrate(db *sql.DB) {
|
||||
log.Println("Starting database migration procedure...")
|
||||
|
||||
// Prepare migrations configuration.
|
||||
var action = "UP"
|
||||
|
||||
actionFromEnv, actionFound := os.LookupEnv("DATABASE_ACTION")
|
||||
if actionFound {
|
||||
log.Println("Migration action override: " + actionFromEnv)
|
||||
@ -35,13 +37,16 @@ func Migrate(db *sql.DB) {
|
||||
}
|
||||
|
||||
var count int64
|
||||
|
||||
countFromEnv, countFound := os.LookupEnv("DATABASE_COUNT")
|
||||
if countFound {
|
||||
log.Println("Migration count override: " + countFromEnv)
|
||||
|
||||
countAsInt, err := strconv.ParseInt(countFromEnv, 10, 64)
|
||||
if err != nil {
|
||||
log.Fatalln("Failed to convert count gathered from DATABASE_COUNT to integer")
|
||||
}
|
||||
|
||||
count = countAsInt
|
||||
} else {
|
||||
log.Println("Applying or rollback this count of migrations: " + countFromEnv + ". 0 - all.")
|
||||
@ -49,27 +54,35 @@ func Migrate(db *sql.DB) {
|
||||
|
||||
// Execute migrations.
|
||||
var err error
|
||||
|
||||
currentDBVersion, gooseerr := goose.GetDBVersion(db)
|
||||
|
||||
if gooseerr != nil {
|
||||
log.Fatalln("Failed to get database version: " + gooseerr.Error())
|
||||
}
|
||||
|
||||
log.Println("Current database version obtained: " + strconv.Itoa(int(currentDBVersion)))
|
||||
if action == "UP" && count == 0 {
|
||||
|
||||
switch {
|
||||
case action == "UP" && count == 0:
|
||||
log.Println("Applying all unapplied migrations...")
|
||||
|
||||
err = goose.Up(db, ".")
|
||||
} else if action == "UP" && count != 0 {
|
||||
case action == "UP" && count != 0:
|
||||
newVersion := currentDBVersion + count
|
||||
log.Println("Migrating database to specific version: " + strconv.Itoa(int(newVersion)))
|
||||
err = goose.UpTo(db, ".", newVersion)
|
||||
} else if action == "DOWN" && count == 0 {
|
||||
case action == "DOWN" && count == 0:
|
||||
log.Println("Downgrading database to zero state, you'll need to re-apply migrations!")
|
||||
err = goose.Down(db, ".")
|
||||
|
||||
_ = goose.Down(db, ".")
|
||||
|
||||
log.Fatalln("Database downgraded to zero state. You have to re-apply migrations")
|
||||
} else if action == "DOWN" && count != 0 {
|
||||
case action == "DOWN" && count != 0:
|
||||
newVersion := currentDBVersion - count
|
||||
log.Println("Downgrading database to specific version: " + strconv.Itoa(int(newVersion)))
|
||||
err = goose.DownTo(db, ".", newVersion)
|
||||
} else {
|
||||
default:
|
||||
log.Fatalln("Unsupported set of migration parameters, cannot continue: " + action + "/" + countFromEnv)
|
||||
}
|
||||
|
||||
|
@ -117,6 +117,7 @@ func TestEventerLaunchNotExistingEvent(t *testing.T) {
|
||||
if err == nil {
|
||||
t.Fatal("LaunchEvent() returned empty error!")
|
||||
}
|
||||
|
||||
require.Nil(t, data)
|
||||
|
||||
Shutdown()
|
||||
|
@ -33,6 +33,7 @@ func Initialize() {
|
||||
// all further events mapping changes.
|
||||
func InitializeCompleted() {
|
||||
eventsInitialized = true
|
||||
|
||||
log.Println("Events initialization completed")
|
||||
}
|
||||
|
||||
@ -53,6 +54,7 @@ func LaunchEvent(eventName string, data interface{}) (interface{}, error) {
|
||||
}
|
||||
|
||||
returnedData := handler.Handler(data)
|
||||
|
||||
return returnedData, nil
|
||||
}
|
||||
|
||||
|
@ -29,7 +29,7 @@ type connection struct {
|
||||
// require start using two goroutines for handling connections,
|
||||
// one for writing and one for reading.
|
||||
transit bool
|
||||
// Connection capabilites.
|
||||
// Connection capabilities.
|
||||
capabilities []string
|
||||
}
|
||||
|
||||
@ -77,6 +77,7 @@ func (c *connection) Start() {
|
||||
log.Println("Failed to write greeting for " + c.remoteAddr.String() + ": " + err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
c.writer.Flush()
|
||||
|
||||
// Start reading for commands.
|
||||
@ -120,8 +121,9 @@ func (c *connection) Start() {
|
||||
}
|
||||
|
||||
dataToWrite += ".\r\n"
|
||||
c.writer.WriteString(dataToWrite)
|
||||
_, _ = c.writer.WriteString(dataToWrite)
|
||||
c.writer.Flush()
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
@ -129,8 +131,9 @@ func (c *connection) Start() {
|
||||
if strings.ToLower(data[0]) == "mode" && strings.ToLower(data[1]) == "reader" {
|
||||
c.transit = false
|
||||
// In any case we'll require user authentication for posting.
|
||||
c.writer.WriteString("201 Posting prohibited\r\n")
|
||||
c.writer.Flush()
|
||||
_, _ = c.writer.WriteString("201 Posting prohibited\r\n")
|
||||
_ = c.writer.Flush()
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
@ -149,7 +152,9 @@ func (c *connection) Start() {
|
||||
log.Println("Failed to write string to socket for " + c.remoteAddr.String() + ": " + err.Error())
|
||||
break
|
||||
}
|
||||
c.writer.Flush()
|
||||
|
||||
_ = c.writer.Flush()
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
@ -161,7 +166,8 @@ func (c *connection) Start() {
|
||||
log.Println("Failed to write string to socket for " + c.remoteAddr.String() + ": " + err1.Error())
|
||||
break
|
||||
}
|
||||
c.writer.Flush()
|
||||
|
||||
_ = c.writer.Flush()
|
||||
|
||||
// Check for QUIT command.
|
||||
if strings.ToLower(data[0]) == "quit" {
|
||||
|
@ -24,6 +24,7 @@ func startServer(config configuration.Network) {
|
||||
if err != nil {
|
||||
log.Fatalln("Failed to start TCP server on " + config.Address + ": " + err.Error())
|
||||
}
|
||||
|
||||
defer func() {
|
||||
err := l.Close()
|
||||
if err != nil {
|
||||
|
Loading…
Reference in New Issue
Block a user