From: Max Gautier <mg@max.gautier.name>
To: git@vger.kernel.org
Cc: "Lénaïc Huard" <lenaic@lhuard.fr>,
"Derrick Stolee" <stolee@gmail.com>,
"Max Gautier" <mg@max.gautier.name>
Subject: [RFC PATCH 5/5] DON'T APPLY YET: maintenance: remove cleanup code
Date: Mon, 18 Mar 2024 16:31:19 +0100 [thread overview]
Message-ID: <20240318153257.27451-6-mg@max.gautier.name> (raw)
In-Reply-To: <20240318153257.27451-1-mg@max.gautier.name>
This removes code to remove old git-maintenance systemd timer and
service user units which were written in $XDG_CONFIG_HOME by git
previous versions.
Signed-off-by: Max Gautier <mg@max.gautier.name>
---
builtin/gc.c | 54 +++-------------------------------------------------
1 file changed, 3 insertions(+), 51 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index 981db8e297..6ac184eaf5 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -2303,12 +2303,7 @@ static int is_systemd_timer_available(void)
return real_is_systemd_timer_available();
}
-static char *xdg_config_home_systemd(const char *filename)
-{
- return xdg_config_home_for("systemd/user", filename);
-}
-
-static int systemd_set_units_state(int enable)
+static int systemd_set_units_state(int run_maintenance, int fd UNUSED)
{
const char *cmd = "systemctl";
struct child_process child = CHILD_PROCESS_INIT;
@@ -2317,7 +2312,7 @@ static int systemd_set_units_state(int enable)
strvec_split(&child.args, cmd);
strvec_pushl(&child.args, "--user", "--force", "--now",
- enable ? "enable" : "disable",
+ run_maintenance ? "enable" : "disable",
"git-maintenance@hourly.timer",
"git-maintenance@daily.timer",
"git-maintenance@weekly.timer", NULL);
@@ -2334,49 +2329,6 @@ static int systemd_set_units_state(int enable)
return 0;
}
-static void systemd_delete_user_unit(char const *unit)
-{
- char const file_start_stale[] = "# This file was created and is"
- " maintained by Git.";
- char file_start_user[sizeof(file_start_stale)] = {'\0'};
-
- char *filename = xdg_config_home_systemd(unit);
- int handle = open(filename, O_RDONLY);
-
- /*
- ** Check this is actually our file and we're not removing a legitimate
- ** user override.
- */
- if (handle == -1 && !is_missing_file_error(errno))
- warning(_("failed to delete '%s'"), filename);
- else {
- read(handle, file_start_user, sizeof(file_start_stale) - 1);
- close(handle);
- if (strcmp(file_start_stale, file_start_user) == 0) {
- if (unlink(filename) == 0)
- warning(_("deleted stale unit file '%s'"), filename);
- else if (!is_missing_file_error(errno))
- warning(_("failed to delete '%s'"), filename);
- }
- }
-
- free(filename);
-}
-
-static int systemd_timer_update_schedule(int run_maintenance, int fd UNUSED)
-{
- /*
- * A previous version of Git wrote the units in the user configuration
- * directory. Clean these up, if they exist.
- */
- systemd_delete_user_unit("git-maintenance@hourly.timer");
- systemd_delete_user_unit("git-maintenance@daily.timer");
- systemd_delete_user_unit("git-maintenance@weekly.timer");
- systemd_delete_user_unit("git-maintenance@.timer");
- systemd_delete_user_unit("git-maintenance@.service");
- return systemd_set_units_state(run_maintenance);
-}
-
enum scheduler {
SCHEDULER_INVALID = -1,
SCHEDULER_AUTO,
@@ -2399,7 +2351,7 @@ static const struct {
[SCHEDULER_SYSTEMD] = {
.name = "systemctl",
.is_available = is_systemd_timer_available,
- .update_schedule = systemd_timer_update_schedule,
+ .update_schedule = systemd_set_units_state,
},
[SCHEDULER_LAUNCHCTL] = {
.name = "launchctl",
--
2.44.0
next prev parent reply other threads:[~2024-03-18 15:33 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-18 15:31 [RFC PATCH 0/5] maintenance: use packaged systemd units Max Gautier
2024-03-18 15:31 ` [RFC PATCH 1/5] maintenance: package " Max Gautier
2024-03-21 12:37 ` Patrick Steinhardt
2024-03-21 13:07 ` Max Gautier
2024-03-21 13:22 ` Patrick Steinhardt
2024-03-21 13:38 ` Max Gautier
2024-03-21 14:44 ` Patrick Steinhardt
2024-03-21 14:49 ` Max Gautier
2024-03-21 14:48 ` Max Gautier
2024-03-18 15:31 ` [RFC PATCH 2/5] maintenance: add fixed random delay to systemd timers Max Gautier
2024-03-21 12:37 ` Patrick Steinhardt
2024-03-21 13:13 ` Max Gautier
2024-03-18 15:31 ` [RFC PATCH 3/5] maintenance: use packaged systemd units Max Gautier
2024-03-19 12:09 ` Max Gautier
2024-03-19 17:17 ` Eric Sunshine
2024-03-19 18:19 ` Junio C Hamano
2024-03-19 19:38 ` Max Gautier
2024-03-21 12:37 ` Patrick Steinhardt
2024-03-21 13:19 ` Max Gautier
2024-03-18 15:31 ` [RFC PATCH 4/5] maintenance: update systemd scheduler docs Max Gautier
2024-03-21 12:37 ` Patrick Steinhardt
2024-03-18 15:31 ` Max Gautier [this message]
2024-03-22 22:11 ` [PATCH v2 0/6] maintenance: use packaged systemd units Max Gautier
2024-03-22 22:11 ` [PATCH v2 1/6] maintenance: use systemd timers builtin randomization Max Gautier
2024-03-22 22:11 ` [PATCH v2 2/6] maintenance: use packaged systemd units Max Gautier
2024-03-23 8:38 ` Eric Sunshine
2024-03-23 9:52 ` Max Gautier
2024-03-22 22:11 ` [PATCH v2 3/6] maintenance: simplify systemctl calls Max Gautier
2024-03-22 23:09 ` Eric Sunshine
2024-03-23 10:25 ` Max Gautier
2024-03-22 22:11 ` [PATCH v2 4/6] maintenance: cleanup $XDG_CONFIG_HOME/systemd/user Max Gautier
2024-03-22 22:38 ` Kristoffer Haugsbakk
2024-03-22 22:43 ` Junio C Hamano
2024-03-23 11:07 ` Max Gautier
2024-03-24 15:45 ` Phillip Wood
2024-03-25 8:36 ` Max Gautier
2024-03-25 16:39 ` Phillip Wood
2024-03-27 16:20 ` Max Gautier
2024-03-22 22:11 ` [PATCH v2 5/6] maintenance: update systemd scheduler docs Max Gautier
2024-03-22 22:11 ` [PATCH v2 6/6] maintenance: update tests for systemd scheduler Max Gautier
2024-03-22 23:02 ` Eric Sunshine
2024-03-23 10:28 ` Max Gautier
2024-03-24 14:54 ` [PATCH v2 0/6] maintenance: use packaged systemd units Phillip Wood
2024-03-24 17:03 ` Eric Sunshine
2024-03-25 10:08 ` phillip.wood123
2024-03-25 8:32 ` Max Gautier
2024-03-25 10:06 ` phillip.wood123
2024-03-25 12:27 ` Max Gautier
2024-03-25 16:39 ` Phillip Wood
2024-03-25 13:45 ` Max Gautier
2024-03-25 16:39 ` Phillip Wood
2024-03-27 16:21 ` Max Gautier
-- strict thread matches above, loose matches on Subject: below --
2024-03-18 15:07 Max Gautier
2024-03-18 15:07 ` [RFC PATCH 5/5] DON'T APPLY YET: maintenance: remove cleanup code Max Gautier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240318153257.27451-6-mg@max.gautier.name \
--to=mg@max.gautier.name \
--cc=git@vger.kernel.org \
--cc=lenaic@lhuard.fr \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).