--- freem/src/fmadm.c 2025/04/14 19:20:20 1.37 +++ freem/src/fmadm.c 2025/04/15 18:19:40 1.40 @@ -1,5 +1,5 @@ /* - * $Id: fmadm.c,v 1.37 2025/04/14 19:20:20 snw Exp $ + * $Id: fmadm.c,v 1.40 2025/04/15 18:19:40 snw Exp $ * FreeM Administration Tool * * @@ -24,6 +24,15 @@ * along with FreeM. If not, see . * * $Log: fmadm.c,v $ + * Revision 1.40 2025/04/15 18:19:40 snw + * Further attempts to fix FreeBSD + * + * Revision 1.39 2025/04/15 16:49:36 snw + * Make use of logprintf throughout codebase + * + * Revision 1.38 2025/04/15 02:24:43 snw + * Improve FreeM logging capabilities + * * Revision 1.37 2025/04/14 19:20:20 snw * Create LOCALSTATEDIR during fmadm configure if needed * @@ -141,6 +150,7 @@ #include "transact.h" #include "namespace.h" #include "fs.h" +#include "log.h" #ifdef HAVE_LIBREADLINE # if defined(HAVE_READLINE_READLINE_H) @@ -201,6 +211,7 @@ extern char env_config_file[4096]; extern char env_user[255]; extern char env_group[255]; extern char env_enabled[10]; +extern char shm_env[255]; int fm_shell(void); void fm_checkperms(void); @@ -388,6 +399,8 @@ int main (int argc, char **argv) printf ("action = '%s' object = '%s' environment = '%s' namespace = '%s' config_file = '%s' base_arg = '%d' next argument = '%s'\n", action, obj_str, fma_environment, fma_namespace, config_file, base_arg, argv[base_arg]); exit(1); */ + strncpy (shm_env, fma_environment, sizeof (shm_env) - 1); + init_log (); /* override for fmadm configure and daemon stuff */ if (got_action) { @@ -1537,7 +1550,8 @@ void fm_configure (void) char jnlhostid[4096]; char jnlcut[4096]; char hostid[4096]; - + char logdir[4096]; + char confbase[4096]; char envbase[4096]; @@ -1577,6 +1591,7 @@ void fm_configure (void) } #endif + snprintf (logdir, sizeof (logdir) - 1, "/var/log/freem"); snprintf (vardir, sizeof (vardir) - 1, "%s", LOCALSTATEDIR); snprintf (varbase, sizeof (varbase) - 1, "%s/freem", LOCALSTATEDIR); snprintf (rundir, sizeof (rundir) - 1, "%s/freem/run", LOCALSTATEDIR); @@ -1644,6 +1659,12 @@ void fm_configure (void) } /* check for existence of needed directories */ + if (stat (logdir, &etcstat) == -1) { + fprintf (stderr, "fmadm: creating %s [logdir]\n", logdir); + mkdir (logdir, 0775); + set_permissions (logdir, username, groupname, 0775); + } + if (stat (SYSCONFDIR, &etcstat) == -1) { fprintf (stderr, "fmadm: creating %s [SYSCONFDIR]\n", SYSCONFDIR); mkdir (SYSCONFDIR, 0775); @@ -1785,6 +1806,15 @@ void fm_configure (void) snprintf (buf, sizeof (buf) - 1, "env_path=%s/freem/%s", LOCALSTATEDIR, fma_environment); fm_write (fp, buf); + + snprintf (buf, sizeof (buf) - 1, "log_threshold_file=info"); + fm_write (fp, buf); + + snprintf (buf, sizeof (buf) - 1, "log_threshold_syslog=info"); + fm_write (fp, buf); + + snprintf (buf, sizeof (buf) - 1, "log_threshold_stderr=warning"); + fm_write (fp, buf); fclose (fp); fprintf (stderr, "[OK]\n"); @@ -1795,6 +1825,9 @@ void fm_configure (void) update_conf (env_config_file, fma_environment, "user", env_user); update_conf (env_config_file, fma_environment, "group", env_group); update_conf (env_config_file, fma_environment, "enabled", env_enabled); + update_conf (env_config_file, fma_environment, "log_threshold_file", "info"); + update_conf (env_config_file, fma_environment, "log_threshold_syslog", "info"); + update_conf (env_config_file, fma_environment, "log_threshold_stderr", "warning"); } if (reconfigure == FALSE) {