Skip to content

Commit f1fce68

Browse files
comchangsclaude
andcommitted
feat: #40 multi-module log viewing with comma-separated -m flag
tow logs -e prod -m noriter-kafka,noriter-zookeeper --all -n 3 Output: [noriter-kafka/kafka-1] 2026-04-02 ... [noriter-kafka/kafka-2] 2026-04-02 ... [noriter-zookeeper/zk-1] 2026-04-02 ... LogsMultiModule() streams from all servers of all specified modules with color-coded [module/server] prefixes. Supports both follow (-F) and non-follow modes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent f529917 commit f1fce68

2 files changed

Lines changed: 91 additions & 0 deletions

File tree

‎cmd/tow/main.go‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,32 @@ Examples:
836836

837837
deployer := deploy.New(cfg, sshMgr)
838838

839+
// Multi-module support: -m kafka,zookeeper
840+
if strings.Contains(modName, ",") {
841+
moduleNames := strings.Split(modName, ",")
842+
var allTargetServers []config.Server
843+
var serverModuleMap []string // parallel array: module name per server
844+
845+
for _, mn := range moduleNames {
846+
mn = strings.TrimSpace(mn)
847+
servers, _, err := cfg.GetServersForModule(envName, mn, 0)
848+
if err != nil {
849+
logger.Warn("Module %s: %v", mn, err)
850+
continue
851+
}
852+
for _, srv := range servers {
853+
allTargetServers = append(allTargetServers, srv)
854+
serverModuleMap = append(serverModuleMap, mn)
855+
}
856+
}
857+
858+
if len(allTargetServers) == 0 {
859+
return fmt.Errorf("no servers found for modules: %s", modName)
860+
}
861+
862+
return deployer.LogsMultiModule(envName, allTargetServers, serverModuleMap, filter, lines, follow)
863+
}
864+
839865
var logsErr error
840866
if allServers {
841867
logsErr = deployer.Logs(envName, modName, 0, filter, lines, follow)

‎internal/deploy/deploy.go‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,71 @@ func (d *Deployer) LogsForServers(envName, moduleName string, servers []config.S
669669
return d.logsMulti(env, servers, moduleName, filter, lines, follow)
670670
}
671671

672+
// LogsMultiModule streams logs from multiple modules across their servers
673+
func (d *Deployer) LogsMultiModule(envName string, servers []config.Server, moduleNames []string, filter string, lines int, follow bool) error {
674+
env, ok := d.cfg.Environments[envName]
675+
if !ok {
676+
return fmt.Errorf("environment %q not found", envName)
677+
}
678+
679+
colorReset := "\033[0m"
680+
681+
if !follow {
682+
for i, srv := range servers {
683+
modName := moduleNames[i]
684+
logPath := d.resolveLogPath(env, srv, modName)
685+
color := serverLogColors[i%len(serverLogColors)]
686+
prefix := fmt.Sprintf("%s[%s/%s]%s ", color, modName, srv.ID(), colorReset)
687+
688+
tailCmd := fmt.Sprintf("tail -n %d %s", lines, logPath)
689+
if filter != "" {
690+
tailCmd += fmt.Sprintf(" | grep '%s'", filter)
691+
}
692+
693+
result, err := d.ssh.Exec(env, srv.Host, tailCmd)
694+
if err != nil {
695+
logger.Warn("[%s/%s] failed to read logs: %v", modName, srv.ID(), err)
696+
continue
697+
}
698+
699+
for _, line := range strings.Split(strings.TrimRight(result.Stdout, "\n"), "\n") {
700+
if line != "" {
701+
fmt.Printf("%s%s\n", prefix, line)
702+
}
703+
}
704+
}
705+
return nil
706+
}
707+
708+
// Follow mode
709+
logger.Info("Streaming logs from %d module/server pairs. Press Ctrl+C to stop.\n", len(servers))
710+
711+
var wg sync.WaitGroup
712+
for i, srv := range servers {
713+
wg.Add(1)
714+
go func(idx int, s config.Server, modName string) {
715+
defer wg.Done()
716+
717+
logPath := d.resolveLogPath(env, s, modName)
718+
color := serverLogColors[idx%len(serverLogColors)]
719+
prefix := fmt.Sprintf("%s[%s/%s]%s ", color, modName, s.ID(), colorReset)
720+
721+
tailCmd := fmt.Sprintf("tail -n %d -f %s", lines, logPath)
722+
if filter != "" {
723+
tailCmd += fmt.Sprintf(" | grep --line-buffered '%s'", filter)
724+
}
725+
726+
pw := &prefixWriter{prefix: prefix, out: os.Stdout}
727+
if err := d.ssh.ExecStream(env, s.Host, tailCmd, pw, pw); err != nil {
728+
logger.Warn("[%s/%s] log stream ended: %v", modName, s.ID(), err)
729+
}
730+
}(i, srv, moduleNames[i])
731+
}
732+
733+
wg.Wait()
734+
return nil
735+
}
736+
672737
// logsSingle handles log reading/streaming for a single server
673738
func (d *Deployer) logsSingle(env *config.Environment, srv config.Server, moduleName, filter string, lines int, follow bool) error {
674739
logPath := d.resolveLogPath(env, srv, moduleName)

0 commit comments

Comments
 (0)