File tree 4 files changed +18
-0
lines changed
4 files changed +18
-0
lines changed Original file line number Diff line number Diff line change @@ -1076,6 +1076,10 @@ CRM_STATE_DIR=${localstatedir}/run/crm
1076
1076
AC_DEFINE_UNQUOTED ( CRM_STATE_DIR ,"$CRM_STATE_DIR" , Where to keep state files and sockets )
1077
1077
AC_SUBST ( CRM_STATE_DIR )
1078
1078
1079
+ CRM_LOG_DIR="${localstatedir}/log/pacemaker"
1080
+ AC_DEFINE_UNQUOTED ( CRM_LOG_DIR ,"$CRM_LOG_DIR" , Where Pacemaker can store log files )
1081
+ AC_SUBST ( CRM_LOG_DIR )
1082
+
1079
1083
CRM_PACEMAKER_DIR=${localstatedir}/lib/pacemaker
1080
1084
AC_DEFINE_UNQUOTED ( CRM_PACEMAKER_DIR ,"$CRM_PACEMAKER_DIR" , Location to store directory produced by Pacemaker daemons )
1081
1085
AC_SUBST ( CRM_PACEMAKER_DIR )
Original file line number Diff line number Diff line change 43
43
44
44
/****** Directories ******/
45
45
46
+ /* Where Pacemaker can store log files */
47
+ #undef CRM_LOG_DIR
48
+
46
49
/* Location for Pacemaker daemons */
47
50
#undef CRM_DAEMON_DIR
48
51
Original file line number Diff line number Diff line change @@ -223,6 +223,10 @@ crm_add_logfile(const char *filename)
223
223
bool is_default = false;
224
224
static int default_fd = -1 ;
225
225
static gboolean have_logfile = FALSE;
226
+
227
+ /* @COMPAT This should be CRM_LOG_DIR "/pacemaker.log". We aren't changing
228
+ * it yet because it will be a significant user-visible change to publicize.
229
+ */
226
230
const char * default_logfile = "/var/log/pacemaker.log" ;
227
231
228
232
struct stat parent ;
Original file line number Diff line number Diff line change @@ -394,6 +394,13 @@ mcp_read_config(void)
394
394
free (debug_enabled );
395
395
}
396
396
397
+ /* If the user didn't explicitly configure a Pacemaker log file, check
398
+ * whether they configured a heartbeat or corosync log file, and use that.
399
+ *
400
+ * @COMPAT This should all go away, and we should just rely on the logging
401
+ * set up by crm_log_init(). We aren't doing this yet because it is a
402
+ * significant user-visible change that will need to be publicized.
403
+ */
397
404
const_value = daemon_option ("debugfile" );
398
405
if (daemon_option ("logfile" )) {
399
406
/* File logging is already setup by crm_log_init() */
You can’t perform that action at this time.
0 commit comments