Skip to content

Fix premature task status reporting for bash and Ansible tasks #3267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
+30,793 −30,774
Draft

Fix premature task status reporting for bash and Ansible tasks #3267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6aeca03
Initial plan
Copilot Sep 2, 2025
8269e27
Initial analysis of bash task premature status reporting issue
Copilot Sep 2, 2025
9321a2f
Fix premature status reporting in bash tasks by adding WaitLog() calls
Copilot Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions admin@localhost/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"bolt": {
"host": "/home/runner/work/semaphore/semaphore/database.boltdb"
},
"dialect": "bolt",
"tmp_path": "/tmp/semaphore",
"cookie_hash": "DVfLPhikqae5xd/ds1AW+Z1Ms9oYg6ym9kecTVwGEGQ=",
"cookie_encryption": "/P3SJDhXbOZBZLSZIzSt3hCURNIbbwzZbM9xD+bpDAw=",
"access_key_encryption": "T3TwsLPmbdvomJ4HNr/J8wIKSHKKAgF7HMu+PE71as0="
}
10 changes: 8 additions & 2 deletions db_lib/AnsiblePlaybook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ func (p AnsiblePlaybook) makeCmd(command string, args []string, environmentVars
func (p AnsiblePlaybook) runCmd(command string, args []string) error {
cmd := p.makeCmd(command, args, nil)
p.Logger.LogCmd(cmd)
return cmd.Run()
err := cmd.Run()
// Wait for all log processing to complete before returning
p.Logger.WaitLog()
return err
}

func (p AnsiblePlaybook) RunPlaybook(args []string, environmentVars []string, inputs map[string]string, cb func(*os.Process)) error {
Expand Down Expand Up @@ -78,7 +81,10 @@ func (p AnsiblePlaybook) RunPlaybook(args []string, environmentVars []string, in

defer func() { _ = ptmx.Close() }()
cb(cmd.Process)
return cmd.Wait()
err = cmd.Wait()
// Wait for all log processing to complete before returning
p.Logger.WaitLog()
return err
}

func (p AnsiblePlaybook) RunGalaxy(args []string) error {
Expand Down
5 changes: 4 additions & 1 deletion db_lib/ShellApp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,8 @@ func (t *ShellApp) Run(args LocalAppRunningArgs) error {
return err
}
args.Callback(cmd.Process)
return cmd.Wait()
err = cmd.Wait()
// Wait for all log processing to complete before returning
t.Logger.WaitLog()
return err
}
Loading
Loading