Skip to content

Commit e0ba25b

Browse files
committed
chore: testing
Signed-off-by: Donnie Adams <[email protected]>
1 parent e5f80b8 commit e0ba25b

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

gptscript.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,19 @@ func NewGPTScript(opts GlobalOptions) (GPTScript, error) {
4949
defer lock.Unlock()
5050
gptscriptCount++
5151

52-
disableServer := os.Getenv("GPT_SCRIPT_DISABLE_SERVER") == "true"
53-
54-
if serverURL == "" && disableServer {
52+
if serverURL == "" {
5553
serverURL = os.Getenv("GPTSCRIPT_URL")
5654
}
5755

58-
if serverProcessCancel == nil && !disableServer {
56+
if serverProcessCancel == nil && os.Getenv("GPTSCRIPT_DISABLE_SERVER") != "true" {
5957
if serverURL == "" {
6058
l, err := net.Listen("tcp", "127.0.0.1:0")
6159
if err != nil {
6260
slog.Debug("failed to start gptscript listener", "err", err)
6361
return nil, fmt.Errorf("failed to start gptscript: %w", err)
6462
}
6563

66-
serverURL = l.Addr().String()
64+
serverURL = strings.Replace(l.Addr().String(), "127.0.0.1", "localhost", 1)
6765
if err = l.Close(); err != nil {
6866
slog.Debug("failed to close gptscript listener", "err", err)
6967
return nil, fmt.Errorf("failed to start gptscript: %w", err)
@@ -74,12 +72,14 @@ func NewGPTScript(opts GlobalOptions) (GPTScript, error) {
7472

7573
in, _ := io.Pipe()
7674
serverProcess = exec.CommandContext(ctx, getCommand(), "--listen-address", serverURL, "sdkserver")
75+
serverProcess.Stdout = os.Stdout
76+
serverProcess.Stderr = os.Stderr
7777
serverProcess.Env = append(os.Environ(), opts.toEnv()...)
7878
serverProcess.Stdin = in
7979

8080
serverProcessCancel = func() {
81-
cancel()
8281
_ = in.Close()
82+
cancel()
8383
}
8484

8585
if err := serverProcess.Start(); err != nil {
@@ -102,13 +102,15 @@ func waitForServerReady(ctx context.Context, serverURL string) error {
102102
for {
103103
resp, err := http.Get("http://" + serverURL + "/healthz")
104104
if err != nil {
105-
slog.DebugContext(ctx, "waiting for server to become ready")
105+
slog.InfoContext(ctx, "waiting for server to become ready", "err", err)
106106
} else {
107107
_ = resp.Body.Close()
108108

109109
if resp.StatusCode == http.StatusOK {
110110
return nil
111111
}
112+
113+
slog.InfoContext(ctx, "waiting for server to become ready", "status", resp.StatusCode)
112114
}
113115

114116
select {

0 commit comments

Comments
 (0)