Skip to content

Fix: release sls resources when preconditions are not met #680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuguorui wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: release sls resources when preconditions are not met #680

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions pkg/sink/sls/sls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func makeSink(info pipeline.Info) api.Component {
type Sink struct {
config *Config

client sls.ClientInterface
client sls.ClientInterface
shutdownChan chan struct{}
}

Expand Down Expand Up @@ -98,32 +98,40 @@ func (s *Sink) Start() error {
// Check if project exist
exist, err := s.client.CheckProjectExist(conf.Project)
if err != nil {
return errors.WithMessagef(err, "Check sls project %s failed", conf.Project)
err = errors.WithMessagef(err, "Check sls project %s failed", conf.Project)
goto errClean
}
if !exist {
return errors.Errorf("Project %s is not exist", conf.Project)
err = errors.Errorf("Project %s is not exist", conf.Project)
goto errClean
}

// Check if LogStore exist
exist, err = s.client.CheckLogstoreExist(conf.Project, conf.LogStore)
if err != nil {
return errors.WithMessagef(err, "Check logstore %s failed", conf.LogStore)
err = errors.WithMessagef(err, "Check logstore %s failed", conf.LogStore)
goto errClean
}
if !exist {
return errors.Errorf("Logstore %s is not exist", conf.LogStore)
err = errors.Errorf("Logstore %s is not exist", conf.LogStore)
goto errClean
}

s.client.SetUserAgent(sls.DefaultLogUserAgent + " loggie/" + global.GetVersion())

return nil

errClean:
s.client.Close()
return err
}

func (s *Sink) Stop() {
if s.client != nil {
s.client.Close()
}

if s.shutdownChan != nil {
if s.shutdownChan != nil {
close(s.shutdownChan)
s.shutdownChan = nil
}
Expand Down