Просмотр исходного кода

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

Duplicates the definition in lib/svcutil.

Co-authored-by: greatroar <@>
greatroar 5 лет назад
Родитель
Сommit
ef0473c091
2 измененных файлов с 1 добавлено и 22 удалено
  1. 1 8
      lib/svcutil/svcutil.go
  2. 0 14
      lib/util/utils.go

+ 1 - 8
lib/svcutil/svcutil.go

@@ -93,11 +93,10 @@ type ServiceWithError interface {
 	suture.Service
 	fmt.Stringer
 	Error() error
-	SetError(error)
 }
 
 // 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 {
 	return &service{
 		creator: creator,
@@ -133,12 +132,6 @@ func (s *service) Error() error {
 	return s.err
 }
 
-func (s *service) SetError(err error) {
-	s.mut.Lock()
-	s.err = err
-	s.mut.Unlock()
-}
-
 func (s *service) String() string {
 	return fmt.Sprintf("Service@%p created by %v", s, s.creator)
 

+ 0 - 14
lib/util/utils.go

@@ -250,20 +250,6 @@ func AddressUnspecifiedLess(a, b net.Addr) bool {
 	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.
 func OnDone(ctx context.Context, fn func()) {
 	go func() {