fix: conflict
ci-agent / build (push) Failing after 1m45s

This commit is contained in:
d3m0k1d
2026-04-04 05:46:42 +03:00
parent ad92439770
commit c59d122e04
4 changed files with 6 additions and 1 deletions
+1
View File
@@ -8,6 +8,7 @@ import (
type AgentConfig struct { type AgentConfig struct {
BackendURL string `yaml:"backend_url"` BackendURL string `yaml:"backend_url"`
GRPCURL string `yaml:"grpc_url"`
RegistrationToken string `yaml:"registration_token"` RegistrationToken string `yaml:"registration_token"`
Label string `yaml:"label"` Label string `yaml:"label"`
CertDir string `yaml:"cert_dir"` CertDir string `yaml:"cert_dir"`
+3
View File
@@ -4,6 +4,7 @@ import (
"context" "context"
"log" "log"
"os" "os"
"strings"
"gitea.d3m0k1d.ru/d3m0k1d/HellreigN/agent/internal/client" "gitea.d3m0k1d.ru/d3m0k1d/HellreigN/agent/internal/client"
"gitea.d3m0k1d.ru/d3m0k1d/HellreigN/agent/internal/commander" "gitea.d3m0k1d.ru/d3m0k1d/HellreigN/agent/internal/commander"
@@ -63,8 +64,10 @@ func main() {
defer cancel() defer cancel()
cmdexe := new(commander.CommandExecutor) cmdexe := new(commander.CommandExecutor)
ccli := client.New(cmdexe, cfg.Label, cfg.Label) ccli := client.New(cmdexe, cfg.Label, cfg.Label)
// Use grpc_url for gRPC connection, strip scheme if present
grpcAddr := cfg.GRPCURL grpcAddr := cfg.GRPCURL
if grpcAddr == "" { if grpcAddr == "" {
// Fallback: derive from backend_url by stripping scheme
grpcAddr = cfg.BackendURL grpcAddr = cfg.BackendURL
} }
grpcAddr = strings.TrimPrefix(grpcAddr, "http://") grpcAddr = strings.TrimPrefix(grpcAddr, "http://")
+2 -1
View File
@@ -1,4 +1,5 @@
backend_url: http://backend:8080 backend_url: http://backend:8080
grpc_url: backend:9001
label: test-agent-1 label: test-agent-1
registration_token: "" registration_token: "156616b56774d59ba53f1eb4b096488bb5f755bbf5b737d93a42bb1b583ad7fb"
cert_dir: /etc/hellreign-agent/certs cert_dir: /etc/hellreign-agent/certs