Skip to content

Commit 50af8fb

Browse files
committed
random stuff
1 parent 01c9b7f commit 50af8fb

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

reporter/reporter.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ type K8sReporter struct {
3434
factory informers.SharedInformerFactory
3535
}
3636

37-
type WorkspaceAgent struct {
38-
Image string
39-
Token string
40-
}
41-
4237
func (k *K8sReporter) Init(ctx context.Context) error {
4338
k.factory = informers.NewSharedInformerFactoryWithOptions(k.Client, 0, informers.WithNamespace(k.Namespace), informers.WithTweakListOptions(func(lo *v1.ListOptions) {
4439
lo.FieldSelector = k.FieldSelector

root.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ func root() *cobra.Command {
4343
}
4444

4545
if artifactoryURL == "" {
46-
return xerrors.New("--coder-url is required")
46+
return xerrors.New("--artifactory-url is required")
4747
}
4848

4949
_, err = url.Parse(artifactoryURL)
5050
if err != nil {
51-
return fmt.Errorf("parse coder URL: %w", err)
51+
return fmt.Errorf("parse artifactory URL: %w", err)
5252
}
5353

5454
if artifactoryUser == "" {
@@ -75,13 +75,13 @@ func root() *cobra.Command {
7575
}
7676

7777
coderClient := reporter.NewClient(coderParsed, coderToken)
78-
78+
logger := slog.Make(sloghuman.Sink(cmd.ErrOrStderr()))
7979
kr := reporter.K8sReporter{
8080
Client: kclient,
8181
JFrogClient: jclient,
8282
CoderClient: coderClient,
8383
Namespace: namespace,
84-
Logger: slog.Make(sloghuman.Sink(cmd.ErrOrStderr())),
84+
Logger: logger,
8585
}
8686

8787
err = kr.Init(cmd.Context())
@@ -91,9 +91,11 @@ func root() *cobra.Command {
9191

9292
stopCh := make(chan struct{})
9393
defer close(stopCh)
94-
go kr.Start(stopCh)
94+
kr.Start(stopCh)
9595
<-cmd.Context().Done()
9696

97+
logger.Info(cmd.Context(), "exiting")
98+
9799
return nil
98100
},
99101
}

0 commit comments

Comments
 (0)