mirror of
https://github.com/taigrr/systemctl.git
synced 2026-03-09 00:14:38 -07:00
feat: add optional variadic args to all commands (#8)
Allow callers to pass additional systemctl flags (e.g. --no-block, --force) via variadic string args on every exported function. This is backward-compatible: existing callers without extra args continue to work unchanged. Introduces a prepareArgs helper to centralize argument construction, replacing the duplicated args/UserMode pattern across all functions. Closes #2
This commit is contained in:
GitHub
@@ -9,74 +9,33 @@ import (
|
||||
"github.com/taigrr/systemctl/properties"
|
||||
)
|
||||
|
||||
// Reload systemd manager configuration.
|
||||
//
|
||||
// This will rerun all generators (see systemd. generator(7)), reload all unit
|
||||
// files, and recreate the entire dependency tree. While the daemon is being
|
||||
// reloaded, all sockets systemd listens on behalf of user configuration will
|
||||
// stay accessible.
|
||||
func daemonReload(ctx context.Context, opts Options) error {
|
||||
args := []string{"daemon-reload", "--system"}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
_, _, _, err := execute(ctx, args)
|
||||
func daemonReload(ctx context.Context, opts Options, args ...string) error {
|
||||
a := prepareArgs("daemon-reload", opts, args...)
|
||||
_, _, _, err := execute(ctx, a)
|
||||
return err
|
||||
}
|
||||
|
||||
// Reenables one or more units.
|
||||
//
|
||||
// This removes all symlinks to the unit files backing the specified units from
|
||||
// the unit configuration directory, then recreates the symlink to the unit again,
|
||||
// atomically. Can be used to change the symlink target.
|
||||
func reenable(ctx context.Context, unit string, opts Options) error {
|
||||
args := []string{"reenable", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
_, _, _, err := execute(ctx, args)
|
||||
func reenable(ctx context.Context, unit string, opts Options, args ...string) error {
|
||||
a := prepareArgs("reenable", opts, append([]string{unit}, args...)...)
|
||||
_, _, _, err := execute(ctx, a)
|
||||
return err
|
||||
}
|
||||
|
||||
// Disables one or more units.
|
||||
//
|
||||
// This removes all symlinks to the unit files backing the specified units from
|
||||
// the unit configuration directory, and hence undoes any changes made by
|
||||
// enable or link.
|
||||
func disable(ctx context.Context, unit string, opts Options) error {
|
||||
args := []string{"disable", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
_, _, _, err := execute(ctx, args)
|
||||
func disable(ctx context.Context, unit string, opts Options, args ...string) error {
|
||||
a := prepareArgs("disable", opts, append([]string{unit}, args...)...)
|
||||
_, _, _, err := execute(ctx, a)
|
||||
return err
|
||||
}
|
||||
|
||||
// Enable one or more units or unit instances.
|
||||
//
|
||||
// This will create a set of symlinks, as encoded in the [Install] sections of
|
||||
// the indicated unit files. After the symlinks have been created, the system
|
||||
// manager configuration is reloaded (in a way equivalent to daemon-reload),
|
||||
// in order to ensure the changes are taken into account immediately.
|
||||
func enable(ctx context.Context, unit string, opts Options) error {
|
||||
args := []string{"enable", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
_, _, _, err := execute(ctx, args)
|
||||
func enable(ctx context.Context, unit string, opts Options, args ...string) error {
|
||||
a := prepareArgs("enable", opts, append([]string{unit}, args...)...)
|
||||
_, _, _, err := execute(ctx, a)
|
||||
return err
|
||||
}
|
||||
|
||||
// Check whether any of the specified units are active (i.e. running).
|
||||
//
|
||||
// Returns true if the unit is active, false if inactive or failed.
|
||||
// Also returns false in an error case.
|
||||
func isActive(ctx context.Context, unit string, opts Options) (bool, error) {
|
||||
args := []string{"is-active", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
stdout, _, _, err := execute(ctx, args)
|
||||
func isActive(ctx context.Context, unit string, opts Options, args ...string) (bool, error) {
|
||||
a := prepareArgs("is-active", opts, append([]string{unit}, args...)...)
|
||||
stdout, _, _, err := execute(ctx, a)
|
||||
stdout = strings.TrimSuffix(stdout, "\n")
|
||||
switch stdout {
|
||||
case "inactive":
|
||||
@@ -92,21 +51,9 @@ func isActive(ctx context.Context, unit string, opts Options) (bool, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// Checks whether any of the specified unit files are enabled (as with enable).
|
||||
//
|
||||
// Returns true if the unit is enabled, aliased, static, indirect, generated
|
||||
// or transient.
|
||||
//
|
||||
// Returns false if disabled. Also returns an error if linked, masked, or bad.
|
||||
//
|
||||
// See https://www.freedesktop.org/software/systemd/man/systemctl.html#is-enabled%20UNIT%E2%80%A6
|
||||
// for more information
|
||||
func isEnabled(ctx context.Context, unit string, opts Options) (bool, error) {
|
||||
args := []string{"is-enabled", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
stdout, _, _, err := execute(ctx, args)
|
||||
func isEnabled(ctx context.Context, unit string, opts Options, args ...string) (bool, error) {
|
||||
a := prepareArgs("is-enabled", opts, append([]string{unit}, args...)...)
|
||||
stdout, _, _, err := execute(ctx, a)
|
||||
stdout = strings.TrimSuffix(stdout, "\n")
|
||||
switch stdout {
|
||||
case "enabled":
|
||||
@@ -140,13 +87,9 @@ func isEnabled(ctx context.Context, unit string, opts Options) (bool, error) {
|
||||
return false, ErrUnspecified
|
||||
}
|
||||
|
||||
// Check whether any of the specified units are in a "failed" state.
|
||||
func isFailed(ctx context.Context, unit string, opts Options) (bool, error) {
|
||||
args := []string{"is-failed", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
stdout, _, _, err := execute(ctx, args)
|
||||
func isFailed(ctx context.Context, unit string, opts Options, args ...string) (bool, error) {
|
||||
a := prepareArgs("is-failed", opts, append([]string{unit}, args...)...)
|
||||
stdout, _, _, err := execute(ctx, a)
|
||||
stdout = strings.TrimSuffix(stdout, "\n")
|
||||
switch stdout {
|
||||
case "inactive":
|
||||
@@ -160,91 +103,47 @@ func isFailed(ctx context.Context, unit string, opts Options) (bool, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// Mask one or more units, as specified on the command line. This will link
|
||||
// these unit files to /dev/null, making it impossible to start them.
|
||||
//
|
||||
// Notably, Mask may return ErrDoesNotExist if a unit doesn't exist, but it will
|
||||
// continue masking anyway. Calling Mask on a non-existing masked unit does not
|
||||
// return an error. Similarly, see Unmask.
|
||||
func mask(ctx context.Context, unit string, opts Options) error {
|
||||
args := []string{"mask", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
_, _, _, err := execute(ctx, args)
|
||||
func mask(ctx context.Context, unit string, opts Options, args ...string) error {
|
||||
a := prepareArgs("mask", opts, append([]string{unit}, args...)...)
|
||||
_, _, _, err := execute(ctx, a)
|
||||
return err
|
||||
}
|
||||
|
||||
// Stop and then start one or more units specified on the command line.
|
||||
// If the units are not running yet, they will be started.
|
||||
func restart(ctx context.Context, unit string, opts Options) error {
|
||||
args := []string{"restart", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
_, _, _, err := execute(ctx, args)
|
||||
func restart(ctx context.Context, unit string, opts Options, args ...string) error {
|
||||
a := prepareArgs("restart", opts, append([]string{unit}, args...)...)
|
||||
_, _, _, err := execute(ctx, a)
|
||||
return err
|
||||
}
|
||||
|
||||
// Show a selected property of a unit. Accepted properties are predefined in the
|
||||
// properties subpackage to guarantee properties are valid and assist code-completion.
|
||||
func show(ctx context.Context, unit string, property properties.Property, opts Options) (string, error) {
|
||||
args := []string{"show", "--system", unit, "--property", string(property)}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
stdout, _, _, err := execute(ctx, args)
|
||||
func show(ctx context.Context, unit string, property properties.Property, opts Options, args ...string) (string, error) {
|
||||
extra := append([]string{unit, "--property", string(property)}, args...)
|
||||
a := prepareArgs("show", opts, extra...)
|
||||
stdout, _, _, err := execute(ctx, a)
|
||||
stdout = strings.TrimPrefix(stdout, string(property)+"=")
|
||||
stdout = strings.TrimSuffix(stdout, "\n")
|
||||
return stdout, err
|
||||
}
|
||||
|
||||
// Start (activate) a given unit
|
||||
func start(ctx context.Context, unit string, opts Options) error {
|
||||
args := []string{"start", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
_, _, _, err := execute(ctx, args)
|
||||
func start(ctx context.Context, unit string, opts Options, args ...string) error {
|
||||
a := prepareArgs("start", opts, append([]string{unit}, args...)...)
|
||||
_, _, _, err := execute(ctx, a)
|
||||
return err
|
||||
}
|
||||
|
||||
// Get back the status string which would be returned by running
|
||||
// `systemctl status [unit]`.
|
||||
//
|
||||
// Generally, it makes more sense to programmatically retrieve the properties
|
||||
// using Show, but this command is provided for the sake of completeness
|
||||
func status(ctx context.Context, unit string, opts Options) (string, error) {
|
||||
args := []string{"status", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
stdout, _, _, err := execute(ctx, args)
|
||||
func status(ctx context.Context, unit string, opts Options, args ...string) (string, error) {
|
||||
a := prepareArgs("status", opts, append([]string{unit}, args...)...)
|
||||
stdout, _, _, err := execute(ctx, a)
|
||||
return stdout, err
|
||||
}
|
||||
|
||||
// Stop (deactivate) a given unit
|
||||
func stop(ctx context.Context, unit string, opts Options) error {
|
||||
args := []string{"stop", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
_, _, _, err := execute(ctx, args)
|
||||
func stop(ctx context.Context, unit string, opts Options, args ...string) error {
|
||||
a := prepareArgs("stop", opts, append([]string{unit}, args...)...)
|
||||
_, _, _, err := execute(ctx, a)
|
||||
return err
|
||||
}
|
||||
|
||||
// Unmask one or more unit files, as specified on the command line.
|
||||
// This will undo the effect of Mask.
|
||||
//
|
||||
// In line with systemd, Unmask will return ErrDoesNotExist if the unit
|
||||
// doesn't exist, but only if it's not already masked.
|
||||
// If the unit doesn't exist but it's masked anyway, no error will be
|
||||
// returned. Gross, I know. Take it up with Poettering.
|
||||
func unmask(ctx context.Context, unit string, opts Options) error {
|
||||
args := []string{"unmask", "--system", unit}
|
||||
if opts.UserMode {
|
||||
args[1] = "--user"
|
||||
}
|
||||
_, _, _, err := execute(ctx, args)
|
||||
func unmask(ctx context.Context, unit string, opts Options, args ...string) error {
|
||||
a := prepareArgs("unmask", opts, append([]string{unit}, args...)...)
|
||||
_, _, _, err := execute(ctx, a)
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user