Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-21 17:01:04 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(be): null pointer

Browse Source
This commit is contained in:
Denis Gukov 2024-09-30 00:58:21 +05:00
parent 08a059a939
commit c7b352dba3
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/router.go
View File

@ -457,10 +457,16 @@ func serveFile(w http.ResponseWriter, r *http.Request, name string) {
}
func getSystemInfo(w http.ResponseWriter, r *http.Request) {
host := ""
if util.WebHostURL != nil {
host = util.WebHostURL.String()
}
body := map[string]interface{}{
"version": util.Version(),
"ansible": util.AnsibleVersion(),
"web_host": util.WebHostURL.String(),
"web_host": host,
"use_remote_runner": util.Config.UseRemoteRunner,
}

25
services/runners/job_pool.go
View File

@ -29,7 +29,7 @@ type JobPool struct {
queue []*job
token *string
//token *string
processing int32
}
@ -106,7 +106,7 @@ func (p *JobPool) Unregister() (err error) {
func (p *JobPool) Run() {
if p.token == nil {
if util.Config.Runner.Token == "" {
panic("runner token required. Please register runner first or create it from web interface.")
}
@ -194,7 +194,7 @@ func (p *JobPool) sendProgress() {
client := &http.Client{}
url := util.Config.Runner.Webhook + "/api/internal/runners"
url := util.Config.WebHost + "/api/internal/runners"
body := RunnerProgress{
Jobs: nil,
@ -224,7 +224,7 @@ func (p *JobPool) sendProgress() {
return
}
req.Header.Set("X-Runner-Token", *p.token)
req.Header.Set("X-Runner-Token", util.Config.Runner.Token)
resp, err := client.Do(req)
if err != nil {
@ -236,16 +236,13 @@ func (p *JobPool) sendProgress() {
}
func (p *JobPool) tryRegisterRunner() bool {
if p.token != nil {
return true
}
log.Info("Attempting to register on the server")
if util.Config.Runner.Token != "" {
p.token = &util.Config.Runner.Token
return true
}
//if util.Config.Runner.Token != "" {
// p.token = &util.Config.Runner.Token
// return true
//}
// Can not restore runner configuration. Register new runner on the server.
@ -297,8 +294,6 @@ func (p *JobPool) tryRegisterRunner() bool {
err = os.WriteFile(util.Config.Runner.TokenFile, []byte(res.Token), 0644)
p.token = &res.Token
defer resp.Body.Close()
return true
@ -307,7 +302,7 @@ func (p *JobPool) tryRegisterRunner() bool {
// checkNewJobs tries to find runner to queued jobs
func (p *JobPool) checkNewJobs() {
if p.token == nil {
if util.Config.Runner.Token == "" {
fmt.Println("Error creating request:", "no token provided")
return
}
@ -318,7 +313,7 @@ func (p *JobPool) checkNewJobs() {
req, err := http.NewRequest("GET", url, nil)
req.Header.Set("X-Runner-Token", *p.token)
req.Header.Set("X-Runner-Token", util.Config.Runner.Token)
if err != nil {
fmt.Println("Error creating request:", err)