guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[shepherd] 01/03: service: Deprecate the 'enable' and 'disable' methods.


From: Ludovic Courtès
Subject: [shepherd] 01/03: service: Deprecate the 'enable' and 'disable' methods.
Date: Sat, 8 Apr 2023 18:21:35 -0400 (EDT)

civodul pushed a commit to branch wip-goopsless
in repository shepherd.

commit 36cfa95a65761c3c5cdd8a698cf1e16e286a19d3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Apr 8 17:47:12 2023 +0200

    service: Deprecate the 'enable' and 'disable' methods.
    
    * modules/shepherd/service.scm (action): Use 'enable-service' and
    'disable-service' and print a message.
    (enable, disable): Deprecate.
---
 modules/shepherd/service.scm | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm
index 8a16dec..f0acfbc 100644
--- a/modules/shepherd/service.scm
+++ b/modules/shepherd/service.scm
@@ -70,8 +70,8 @@
 
             action?
 
-            enable
-            disable
+            enable-service
+            disable-service
             start
             start-in-the-background
             stop
@@ -154,6 +154,8 @@
             running?
             stopped?
             enabled?
+            enable
+            disable
             action-list
             lookup-action
             defines-action?))
@@ -667,16 +669,6 @@ symbols)."
   "Return whether @var{service} implements the action @var{action}."
   (and (lookup-service-action service action) #t))
 
-;; Enable the service, allow it to get started.
-(define-method (enable (obj <service>))
-  (enable-service obj)
-  (local-output (l10n "Enabled service ~a.") (service-canonical-name obj)))
-
-;; Disable the service, make it unstartable.
-(define-method (disable (obj <service>))
-  (disable-service obj)
-  (local-output (l10n "Disabled service ~a.") (service-canonical-name obj)))
-
 (define %one-shot-services-started
   ;; Bookkeeping of one-shot services already started.
   (make-parameter #f))                            ;#f | hash table
@@ -869,10 +861,14 @@ is not already running, and will return SERVICE's 
canonical name in a list."
        (lambda (_) obj))
       ((enable)
        (lambda (_)
-         (enable obj)))
+         (enable-service obj)
+         (local-output (l10n "Enabled service ~a.")
+                       (service-canonical-name obj))))
       ((disable)
        (lambda (_)
-         (disable obj)))
+         (disable-service obj)
+         (local-output (l10n "Disabled service ~a.")
+                       (service-canonical-name obj))))
       ((doc)
        (lambda (_ . args)
          (apply doc obj args)))
@@ -2525,6 +2521,9 @@ deprecated in favor of procedure '~a'"
 (define-deprecated-service-getter stopped? service-stopped?)
 (define-deprecated-service-getter enabled? service-enabled?)
 
+(define-deprecated-service-getter enable enable-service)
+(define-deprecated-service-getter disable disable-service)
+
 (define-deprecated-method (lookup-action (service <service>) action)
   lookup-service-action)
 (define-deprecated-method (defines-action? (service <service>) action)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]