diff --git a/internal/cmd/polecat.go b/internal/cmd/polecat.go index 262c3454..7e637c03 100644 --- a/internal/cmd/polecat.go +++ b/internal/cmd/polecat.go @@ -1205,20 +1205,9 @@ func runPolecatRecycle(cmd *cobra.Command, args []string) error { return nil } -// splitLines splits a string into non-empty lines. +// splitLines splits a string into lines. func splitLines(s string) []string { - var lines []string - for _, line := range filepath.SplitList(s) { - if line != "" { - lines = append(lines, line) - } - } - // filepath.SplitList doesn't work for newlines, use strings.Split instead - lines = nil - for _, line := range strings.Split(s, "\n") { - lines = append(lines, line) - } - return lines + return strings.Split(s, "\n") } func runPolecatNuke(cmd *cobra.Command, args []string) error { diff --git a/internal/lock/lock.go b/internal/lock/lock.go index 355fef54..4a5cad5c 100644 --- a/internal/lock/lock.go +++ b/internal/lock/lock.go @@ -22,10 +22,9 @@ import ( // Common errors var ( - ErrLocked = errors.New("worker is locked by another agent") - ErrNotLocked = errors.New("worker is not locked") - ErrStaleLock = errors.New("stale lock detected") - ErrInvalidLock = errors.New("invalid lock file") + ErrLocked = errors.New("worker is locked by another agent") + ErrNotLocked = errors.New("worker is not locked") + ErrInvalidLock = errors.New("invalid lock file") ) // LockInfo contains information about who holds a lock. diff --git a/internal/refinery/manager.go b/internal/refinery/manager.go index 11a0fd7c..0ee14225 100644 --- a/internal/refinery/manager.go +++ b/internal/refinery/manager.go @@ -519,20 +519,6 @@ func (m *Manager) completeMR(mr *MergeRequest, closeReason CloseReason, errMsg s _ = m.saveState(ref) // non-fatal: state file update } -// getTestCommand returns the test command if configured. -func (m *Manager) getTestCommand() string { - // Check settings/config.json for test_command - settingsPath := filepath.Join(m.rig.Path, "settings", "config.json") - settings, err := config.LoadRigSettings(settingsPath) - if err != nil { - return "" - } - if settings.MergeQueue != nil && settings.MergeQueue.TestCommand != "" { - return settings.MergeQueue.TestCommand - } - return "" -} - // runTests executes the test command. func (m *Manager) runTests(testCmd string) error { parts := strings.Fields(testCmd) diff --git a/internal/townlog/logger.go b/internal/townlog/logger.go index 369bfde3..e0fbc666 100644 --- a/internal/townlog/logger.go +++ b/internal/townlog/logger.go @@ -2,7 +2,6 @@ package townlog import ( - "encoding/json" "fmt" "os" "path/filepath" @@ -272,12 +271,6 @@ func splitLines(s string) []string { return lines } -// LogEventJSON writes an event in JSON format for machine parsing. -// Returns the JSON representation. -func (e Event) JSON() ([]byte, error) { - return json.Marshal(e) -} - // TailEvents returns the last n events from the log. func TailEvents(townRoot string, n int) ([]Event, error) { events, err := ReadEvents(townRoot)