Skip to content
Snippets Groups Projects
Commit d323d859 authored by David Bigagli's avatar David Bigagli
Browse files

Modify slurmstepd to log using LogTimeFormat in slurm.conf.

parent fc0a821c
No related branches found
No related tags found
No related merge requests found
...@@ -71,6 +71,7 @@ extern void pack_slurmd_conf_lite(slurmd_conf_t *conf, Buf buffer) ...@@ -71,6 +71,7 @@ extern void pack_slurmd_conf_lite(slurmd_conf_t *conf, Buf buffer)
packstr(conf->node_topo_addr, buffer); packstr(conf->node_topo_addr, buffer);
packstr(conf->node_topo_pattern, buffer); packstr(conf->node_topo_pattern, buffer);
pack32((uint32_t)conf->port, buffer); pack32((uint32_t)conf->port, buffer);
pack16(conf->log_fmt, buffer);
} }
extern int unpack_slurmd_conf_lite_no_alloc(slurmd_conf_t *conf, Buf buffer) extern int unpack_slurmd_conf_lite_no_alloc(slurmd_conf_t *conf, Buf buffer)
...@@ -109,6 +110,7 @@ extern int unpack_slurmd_conf_lite_no_alloc(slurmd_conf_t *conf, Buf buffer) ...@@ -109,6 +110,7 @@ extern int unpack_slurmd_conf_lite_no_alloc(slurmd_conf_t *conf, Buf buffer)
safe_unpackstr_xmalloc(&conf->node_topo_addr, &uint32_tmp, buffer); safe_unpackstr_xmalloc(&conf->node_topo_addr, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&conf->node_topo_pattern, &uint32_tmp, buffer); safe_unpackstr_xmalloc(&conf->node_topo_pattern, &uint32_tmp, buffer);
safe_unpack32(&uint32_tmp, buffer); safe_unpack32(&uint32_tmp, buffer);
safe_unpack16(&conf->log_fmt, buffer);
conf->port = uint32_tmp; conf->port = uint32_tmp;
return SLURM_SUCCESS; return SLURM_SUCCESS;
......
...@@ -404,7 +404,9 @@ _init_from_slurmd(int sock, char **argv, ...@@ -404,7 +404,9 @@ _init_from_slurmd(int sock, char **argv,
/* receive conf from slurmd */ /* receive conf from slurmd */
if ((conf = read_slurmd_conf_lite (sock)) == NULL) if ((conf = read_slurmd_conf_lite (sock)) == NULL)
fatal("Failed to read conf from slurmd"); fatal("Failed to read conf from slurmd");
log_alter(conf->log_opts, 0, conf->logfile); log_alter(conf->log_opts, 0, conf->logfile);
log_set_timefmt(conf->log_fmt);
debug2("debug level is %d.", conf->debug_level); debug2("debug level is %d.", conf->debug_level);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment