Skip to content

Commit 2bae7dc

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

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

gptscript.go

+15-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
"io"
87
"log/slog"
98
"net"
109
"net/http"
@@ -49,13 +48,11 @@ func NewGPTScript(opts GlobalOptions) (GPTScript, error) {
4948
defer lock.Unlock()
5049
gptscriptCount++
5150

52-
disableServer := os.Getenv("GPT_SCRIPT_DISABLE_SERVER") == "true"
53-
54-
if serverURL == "" && disableServer {
51+
if serverURL == "" {
5552
serverURL = os.Getenv("GPTSCRIPT_URL")
5653
}
5754

58-
if serverProcessCancel == nil && !disableServer {
55+
if serverProcessCancel == nil && os.Getenv("GPTSCRIPT_DISABLE_SERVER") != "true" {
5956
if serverURL == "" {
6057
l, err := net.Listen("tcp", "127.0.0.1:0")
6158
if err != nil {
@@ -72,14 +69,21 @@ func NewGPTScript(opts GlobalOptions) (GPTScript, error) {
7269

7370
ctx, cancel := context.WithCancel(context.Background())
7471

75-
in, _ := io.Pipe()
7672
serverProcess = exec.CommandContext(ctx, getCommand(), "--listen-address", serverURL, "sdkserver")
73+
serverProcess.Stdout = os.Stdout
74+
serverProcess.Stderr = os.Stderr
7775
serverProcess.Env = append(os.Environ(), opts.toEnv()...)
78-
serverProcess.Stdin = in
76+
stdin, err := serverProcess.StdinPipe()
77+
if err != nil {
78+
cancel()
79+
return nil, err
80+
}
81+
82+
stdin.Write([]byte("start!!!"))
7983

8084
serverProcessCancel = func() {
85+
_ = stdin.Close()
8186
cancel()
82-
_ = in.Close()
8387
}
8488

8589
if err := serverProcess.Start(); err != nil {
@@ -102,13 +106,15 @@ func waitForServerReady(ctx context.Context, serverURL string) error {
102106
for {
103107
resp, err := http.Get("http://" + serverURL + "/healthz")
104108
if err != nil {
105-
slog.DebugContext(ctx, "waiting for server to become ready")
109+
slog.InfoContext(ctx, "waiting for server to become ready", "err", err)
106110
} else {
107111
_ = resp.Body.Close()
108112

109113
if resp.StatusCode == http.StatusOK {
110114
return nil
111115
}
116+
117+
slog.InfoContext(ctx, "waiting for server to become ready", "status", resp.StatusCode)
112118
}
113119

114120
select {

0 commit comments

Comments
 (0)