Skip to content

chore: Removed dead code of rhsmcertd binary #3578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jirihnidek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: Removed dead code of rhsmcertd binary #3578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions man/rhsmcertd.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ file are used (unless the argument is passed again).

.TP
.B -r, --auto-registration-interval=MINUTES
Resets the interval for automatic registration. This value is in minutes. The default is 60, or 1 hour. This interval is in effect until the daemon restarts, and then the values in the
This CLI option is no-op and is deprecated. The auto-registration interval is read only from
.B /etc/rhsm/rhsm.conf
file are used (unless the argument is passed again).
file.

.TP
.B -s, --no-splay
Expand Down
43 changes: 10 additions & 33 deletions src/daemons/rhsmcertd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,10 @@ typedef enum {
#define LOGFILE LOGDIR"/rhsmcertd.log"
#define LOCKFILE "/var/lock/subsys/rhsmcertd"
#define NEXT_CERT_UPDATE_FILE "/run/rhsm/next_cert_check_update"
#define NEXT_AUTO_REGISTER_UPDATE_FILE "/run/rhsm/next_auto_register_update"
#define WORKER LIBEXECDIR"/rhsmcertd-worker"
#define WORKER_NAME WORKER
#define PACKAGE_PROFILE_UPLOADER LIBEXECDIR"/rhsm-package-profile-uploader"
#define INITIAL_DELAY_SECONDS 120
#define DEFAULT_AUTO_REG_INTERVAL_SECONDS 3600 /* 1 hour */
#define DEFAULT_CERT_INTERVAL_SECONDS 14400 /* 4 hours */
#define DEFAULT_SPLAY_ENABLED true
#define DEFAULT_AUTO_REGISTRATION false
Expand Down Expand Up @@ -100,7 +98,7 @@ static GOptionEntry entries[] = {
N_("interval to run cert check (in minutes)"),
"MINUTES"},
{"auto-registration-interval", 'r', 0, G_OPTION_ARG_INT, &arg_reg_interval_minutes,
N_("interval to run auto-registration (in minutes)"),
N_("this CLI option is no-op and deprecated"),
"MINUTES"},
{"now", 'n', 0, G_OPTION_ARG_NONE, &run_now,
N_("run the initial checks immediately, with no delay"),
Expand All @@ -117,7 +115,6 @@ static GOptionEntry entries[] = {
};

typedef struct _Config {
int auto_reg_interval_seconds;
int cert_interval_seconds;
bool splay;
bool auto_registration;
Expand Down Expand Up @@ -410,13 +407,12 @@ get_lock ()
return ret;
}

static gboolean
auto_register(gpointer data)
static void
auto_register(void)
{
(void)data;
int status = 0;

int pid = fork ();
const int pid = fork ();
if (pid < 0) {
error ("fork failed");
exit (EXIT_FAILURE);
Expand All @@ -431,10 +427,8 @@ auto_register(gpointer data)

if (status == 0) {
info ("(Auto-registration) performed successfully.");
return false;
} else {
warn ("(Auto-registration) failed (%d)", status);
return false;
}
}

Expand Down Expand Up @@ -616,15 +610,6 @@ key_file_init_config (Config * config, GKeyFile * key_file)
"splay", DEFAULT_SPLAY_ENABLED);
config->splay = splay_enabled;

int auto_reg_interval = get_int_from_config_file (
key_file,
"rhsmcertd",
"auto_registration_interval"
);
if (auto_reg_interval > 0) {
config->auto_reg_interval_seconds = auto_reg_interval * 60;
}

bool auto_registration_enabled = get_bool_from_config_file (
key_file,
"rhsmcertd",
Expand Down Expand Up @@ -687,7 +672,10 @@ opt_parse_init_config (Config * config)
}

if (arg_reg_interval_minutes != -1) {
config->auto_reg_interval_seconds = arg_reg_interval_minutes * 60;
warn ("The --auto-registration-interval option is no-op and deprecated");
printf (N_
("WARN: The --auto-registration-interval option is no-op and deprecated.\n")
);
}

if (arg_no_splay) {
Expand All @@ -700,7 +688,6 @@ opt_parse_init_config (Config * config)
// Let the caller know if opt parser found arg values
// for the intervals.
return arg_cert_interval_minutes != -1
|| arg_reg_interval_minutes != -1
|| arg_no_splay != FALSE
|| arg_auto_registration != FALSE;
}
Expand All @@ -712,7 +699,6 @@ get_config (int argc, char *argv[])
config = malloc (sizeof (Config));

// Set the default values
config->auto_reg_interval_seconds = DEFAULT_AUTO_REG_INTERVAL_SECONDS;
config->cert_interval_seconds = DEFAULT_CERT_INTERVAL_SECONDS;
config->splay = DEFAULT_SPLAY_ENABLED;
config->auto_registration = DEFAULT_AUTO_REGISTRATION;
Expand Down Expand Up @@ -800,7 +786,6 @@ main (int argc, char *argv[])

// Pull values from the config object so that we can free
// up its resources more reliably in case of error.
int auto_reg_interval_seconds = config->auto_reg_interval_seconds;
int cert_interval_seconds = config->cert_interval_seconds;
bool splay_enabled = config->splay;
bool auto_reg_enabled = config->auto_registration;
Expand Down Expand Up @@ -834,8 +819,7 @@ main (int argc, char *argv[])

info ("Starting rhsmcertd...");
if (auto_reg_enabled) {
info ("Auto-registration interval: %.1f minutes [%d seconds]",
auto_reg_interval_seconds / 60.0, auto_reg_interval_seconds);
info ("Auto-registration enabled");
} else {
debug ("Auto-registration disabled");
}
Expand Down Expand Up @@ -898,25 +882,18 @@ main (int argc, char *argv[])
INITIAL_DELAY_SECONDS / 60.0, cert_check_offset, cert_check_initial_delay);
}

struct CertCheckData auto_register_data;
auto_register_data.interval_seconds = auto_reg_interval_seconds;
auto_register_data.next_update_file = NEXT_AUTO_REGISTER_UPDATE_FILE;

struct CertCheckData cert_check_data;
cert_check_data.interval_seconds = cert_interval_seconds;
cert_check_data.next_update_file = NEXT_CERT_UPDATE_FILE;

if (auto_reg_enabled) {
auto_register((gpointer) &auto_register_data);
auto_register();
}
g_timeout_add (cert_check_initial_delay * 1000,
(GSourceFunc) initial_cert_check, (gpointer) &cert_check_data);

// NB: we only use cert_interval_seconds when calculating the next update
// time.
if (auto_reg_enabled) {
log_update (0, NEXT_AUTO_REGISTER_UPDATE_FILE);
}
log_update (cert_check_initial_delay, NEXT_CERT_UPDATE_FILE);

GMainLoop *main_loop = g_main_loop_new (main_context, FALSE);
Expand Down