Skip to content

Commit

Permalink
fix(treewide): Fix small warnings across the project
Browse files Browse the repository at this point in the history
  • Loading branch information
etu committed Jan 30, 2025
1 parent 79e1cb6 commit ed26ce5
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 36 deletions.
6 changes: 3 additions & 3 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ func (config *Config) Save() {

func (config *Config) WriteServer(server ServerConfig) error {
if len(server.Name) == 0 {
return fmt.Errorf("Server 'name' cannot be empty")
return fmt.Errorf("server 'name' cannot be empty")
}

if len(server.Directory) == 0 {
return fmt.Errorf("Server 'cwd' cannot be empty")
return fmt.Errorf("server 'cwd' cannot be empty")
}

if len(server.Command) == 0 {
return fmt.Errorf("Server 'cmd' cannot be empty")
return fmt.Errorf("server 'cmd' cannot be empty")
}

// Store the sent server config to the config.
Expand Down
14 changes: 7 additions & 7 deletions runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ func (runner *Runner) Start(name string, serve *Serve) error {
}

if _, ok := runner.config.Servers[name]; !ok {
return fmt.Errorf("Unknown server %s", name)
return fmt.Errorf("unknown server %s", name)
}

if _, ok := runner.ActiveProcesses[name]; ok {
return fmt.Errorf("Server is already running: %s", name)
return fmt.Errorf("server is already running: %s", name)
}

// Split the command on the first space since exec.Command will
Expand Down Expand Up @@ -101,18 +101,18 @@ func (runner *Runner) Start(name string, serve *Serve) error {
// Set up pipe to read stdout
stdout, err := cmd.StdoutPipe()
if err != nil {
return fmt.Errorf("Failed to set up stdout pipe: %s", err)
return fmt.Errorf("failed to set up stdout pipe: %s", err)
}

// Set up pipe to read stderr
stderr, err := cmd.StderrPipe()
if err != nil {
return fmt.Errorf("Failed to set up stderr pipe: %s", err)
return fmt.Errorf("failed to set up stderr pipe: %s", err)
}

// Start the command
if err := cmd.Start(); err != nil {
return fmt.Errorf("Failed to start process: %s", err)
return fmt.Errorf("failed to start process: %s", err)
}

// Read stdout while the command is executed
Expand Down Expand Up @@ -158,7 +158,7 @@ func (runner *Runner) randomizePortNumber() (uint, error) {
portRangeSize := int(runner.config.Settings.PortRangeMax - runner.config.Settings.PortRangeMin)

if len(runner.ActiveProcesses) >= portRangeSize {
return 0, fmt.Errorf("Out of ports, won't be able to find a port in configured range")
return 0, fmt.Errorf("out of ports, won't be able to find a port in configured range")
}

// Randomize ports within the range
Expand All @@ -181,7 +181,7 @@ func (runner *Runner) randomizePortNumber() (uint, error) {
}
}

return 0, fmt.Errorf("Tried to randomize an unused port, failed")
return 0, fmt.Errorf("tried to randomize an unused port, failed")
}

func (runner *Runner) Stop(name string, serve *Serve) error {
Expand Down
49 changes: 23 additions & 26 deletions serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,35 +277,32 @@ func (serve *Serve) newRouter() *mux.Router {
// Store last send time to avoid sending too many messages per second
var lastSend int64

for {
select {
case <-serve.stateChange:
// Limit the amount of messages sent per second to send at most every 100ms
// to avoid flooding the client with messages.
if ((time.Now().UnixNano() / int64(time.Millisecond)) - 100) < lastSend {
continue
}
for range serve.stateChange {
// Limit the amount of messages sent per second to send at most every 100ms
// to avoid flooding the client with messages.
if ((time.Now().UnixNano() / int64(time.Millisecond)) - 100) < lastSend {
continue
}

// Store the last send time
lastSend = time.Now().UnixNano() / int64(time.Millisecond)
// Store the last send time
lastSend = time.Now().UnixNano() / int64(time.Millisecond)

for client, name := range serve.clientSubscriptions {
// Send the list state regardless of subscription
listState := serve.GetServerList()
serve.sendMessage(client, listState)
for client, name := range serve.clientSubscriptions {
// Send the list state regardless of subscription
listState := serve.GetServerList()
serve.sendMessage(client, listState)

// Skip clients with no subscription
if name == "" {
continue
}
// Skip clients with no subscription
if name == "" {
continue
}

// Send state for the subscribed server
serverState := serve.GetServerLogs(name)
// Send state for the subscribed server
serverState := serve.GetServerLogs(name)

// Only send logs if there are any
if len(serverState.Logs) > 0 {
serve.sendMessage(client, serverState)
}
// Only send logs if there are any
if len(serverState.Logs) > 0 {
serve.sendMessage(client, serverState)
}
}
}
Expand All @@ -319,7 +316,7 @@ func (serve *Serve) GetServer(name string) (ServerItem, error) {

// Check if name is a valid entry in serve.config.Servers, if
// it isn't, return error.
if _, ok := serve.config.Servers[name]; ok == false {
if _, ok := serve.config.Servers[name]; !ok {
return serverItem, errors.New("Undefined server requested '" + name + "'")
}

Expand Down Expand Up @@ -369,7 +366,7 @@ func (serve *Serve) GetServerLogs(name string) ServerItemWithLogs {

serverItemWithLogs.ServerItem, _ = serve.GetServer(name)

if serverItemWithLogs.ServerItem.IsRunning == true {
if serverItemWithLogs.ServerItem.IsRunning {
serverItemWithLogs.Logs = serve.runner.ActiveProcesses[name].Logs
}

Expand Down

0 comments on commit ed26ce5

Please sign in to comment.