dashboard / pubsub / refactor: create remote client lib #28 rss

accepted · opened on 2024-11-12T14:50:03Z by erock
Help 
# add changes to patch request
git format-patch main --stdout | ssh pr.pico.sh pr add 28
# add review to patch request
git format-patch main --stdout | ssh pr.pico.sh pr add --review 28
# remove patchset
ssh pr.pico.sh ps rm ps-x
# checkout all patches
ssh pr.pico.sh pr print 28 | git am -3
# print a diff between the last two patches in a patch request
ssh pr.pico.sh pr diff 28
# accept PR
ssh pr.pico.sh pr accept 28
# close PR
ssh pr.pico.sh pr close 28

Logs

erock created pr with ps-59 on 2024-11-12T14:50:03Z
erock added ps-60 on 2024-11-12T15:09:30Z
erock added ps-61 on 2024-11-12T15:13:28Z
erock added ps-62 on 2024-11-12T15:14:29Z
erock changed status on 2024-11-12T16:25:08Z {"status":"accepted"}

Patchsets

ps-59 by erock on 2024-11-12T14:50:03Z
Range Diff ↕ rd-60
1: 57a5727 = 1: 57a5727 refactor: create remote client lib
-: ------- > 2: 67d38ff refactor(log): rm ConnectToLogs
ps-60 by erock on 2024-11-12T15:09:30Z
Range Diff ↕ rd-61
1: 57a5727 = 1: 57a5727 refactor: create remote client lib
2: 67d38ff = 2: 67d38ff refactor(log): rm ConnectToLogs
-: ------- > 3: 97084b4 refactor(log): preserve `ConnectToLogs` but make it a convenient proxy
ps-61 by erock on 2024-11-12T15:13:28Z
Range Diff ↕ rd-62
1: 57a5727 = 1: 57a5727 refactor: create remote client lib
2: 67d38ff ! 2: 866d44c refactor(log): `ConnectToLogs`
3: 97084b4 < -: ------- refactor(log): preserve `ConnectToLogs` but make it a convenient proxy
ps-62 by erock on 2024-11-12T15:14:29Z

Range-diff rd-62

title
refactor: create remote client lib
description
Patch equal
old #1
57a5727
new #1
57a5727
title
refactor(log): `ConnectToLogs`
description
Patch changed
old #2
67d38ff
new #2
866d44c
title
refactor(log): preserve `ConnectToLogs` but make it a convenient proxy
description
Patch removed
old #3
97084b4
new #0
(none)
Back to top
1: 57a5727 = 1: 57a5727 refactor: create remote client lib
2: 67d38ff ! 2: 866d44c refactor(log): `ConnectToLogs`
log/log.go
 
 var _ io.Writer = (*PubSubLogWriter)(nil)
 var _ slog.Handler = (*MultiHandler)(nil)
-
-func ConnectToLogs(ctx context.Context, connectionInfo *pubsub.RemoteClientInfo) (io.Reader, error) {
-	sshClient, err := pubsub.CreateRemoteClient(connectionInfo)
-	if err != nil {
-		return nil, err
-	}
-
-	session, err := sshClient.NewSession()
-	if err != nil {
-		return nil, err
-	}
-
-	stdoutPipe, err := session.StdoutPipe()
-	if err != nil {
-		return nil, err
-	}
-
-	err = session.Start("sub log-drain -k")
-	if err != nil {
-		return nil, err
-	}
-
-	go func() {
-		<-ctx.Done()
-		session.Close()
-		sshClient.Close()
-	}()
-
-	return stdoutPipe, nil
-}
+	return pubsub.RemoteSub("sub log-drain -k", ctx, connectionInfo)
log/log.go
 var _ slog.Handler = (*MultiHandler)(nil)
-
-func ConnectToLogs(ctx context.Context, connectionInfo *pubsub.RemoteClientInfo) (io.Reader, error) {
 
 func ConnectToLogs(ctx context.Context, connectionInfo *pubsub.RemoteClientInfo) (io.Reader, error) {
-	sshClient, err := pubsub.CreateRemoteClient(connectionInfo)
-	if err != nil {
-		return nil, err
-	}
-
-	session, err := sshClient.NewSession()
-	if err != nil {
-		return nil, err
-	}
-
-	stdoutPipe, err := session.StdoutPipe()
-	if err != nil {
-		return nil, err
-	}
-
-	err = session.Start("sub log-drain -k")
-	if err != nil {
-		return nil, err
-	}
-
-	go func() {
-		<-ctx.Done()
-		session.Close()
-		sshClient.Close()
-	}()
-
-	return stdoutPipe, nil
-}
+	return pubsub.RemoteSub("sub log-drain -k", ctx, connectionInfo)
 }
3: 97084b4 < -: ------- refactor(log): preserve `ConnectToLogs` but make it a convenient proxy