octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 03:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/util, lib/svcutil: Remove unused code (#7309)

Browse Source 
Duplicates the definition in lib/svcutil.

Co-authored-by: greatroar <@>
This commit is contained in:
greatroar 2021-01-27 16:33:01 +01:00 committed by GitHub
parent 3406a3ba95
commit ef0473c091
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/svcutil/svcutil.go
View File

@ -93,11 +93,10 @@ type ServiceWithError interface {
suture.Service suture.Service
fmt.Stringer fmt.Stringer
Error() error Error() error
SetError(error)
} }
// AsService wraps the given function to implement suture.Service. In addition // AsService wraps the given function to implement suture.Service. In addition
// it keeps track of the returned error and allows querying and setting that error. // it keeps track of the returned error and allows querying that error.
func AsService(fn func(ctx context.Context) error, creator string) ServiceWithError { func AsService(fn func(ctx context.Context) error, creator string) ServiceWithError {
return &service{ return &service{
creator: creator, creator: creator,
@ -133,12 +132,6 @@ func (s *service) Error() error {
return s.err return s.err
} }
func (s *service) SetError(err error) {
s.mut.Lock()
s.err = err
s.mut.Unlock()
}
func (s *service) String() string { func (s *service) String() string {
return fmt.Sprintf("Service@%p created by %v", s, s.creator) return fmt.Sprintf("Service@%p created by %v", s, s.creator)

14
lib/util/utils.go
View File

@ -250,20 +250,6 @@ func AddressUnspecifiedLess(a, b net.Addr) bool {
return aIsUnspecified return aIsUnspecified
} }
type ExitStatus int
const (
ExitSuccess ExitStatus = 0
ExitError ExitStatus = 1
ExitNoUpgradeAvailable ExitStatus = 2
ExitRestart ExitStatus = 3
ExitUpgrade ExitStatus = 4
)
func (s ExitStatus) AsInt() int {
return int(s)
}
// OnDone calls fn when ctx is cancelled. // OnDone calls fn when ctx is cancelled.
func OnDone(ctx context.Context, fn func()) { func OnDone(ctx context.Context, fn func()) {
go func() { go func() {