Skip to content

Commit fa75762

Browse files
committed
Refactor: daemons: Make unknown request messages more similar.
Some (but not all) daemons can handle both IPC and CPG message types, so the unknown request message should be able to print both. I'm doing this even on daemons that only handle one type in the interest of making these functions as similar as possible. Other daemons have a different style of unknown request function. Rather than sort that out right now (I think we'll need to figure out the ACK vs NACK thing first), I'm just removing the message type detail from the result.
1 parent 4360b69 commit fa75762

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

daemons/attrd/attrd_messages.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ remove_unsupported_sync_points(pcmk__request_t *request)
5555
static xmlNode *
5656
handle_unknown_request(pcmk__request_t *request)
5757
{
58-
crm_err("Unknown IPC request %s from %s %s",
58+
crm_err("Unknown %s request %s from %s %s",
59+
(request->ipc_client != NULL) ? "IPC" : "CPG",
5960
request->op, pcmk__request_origin_type(request),
6061
pcmk__request_origin(request));
6162
pcmk__format_result(&request->result, CRM_EX_PROTOCOL, PCMK_EXEC_INVALID,

daemons/execd/execd_messages.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ handle_unknown_request(pcmk__request_t *request)
402402
PCMK__XE_NACK, NULL, CRM_EX_PROTOCOL);
403403

404404
pcmk__format_result(&request->result, CRM_EX_PROTOCOL, PCMK_EXEC_INVALID,
405-
"Unknown IPC request type '%s' (bug?)",
405+
"Unknown request type '%s' (bug?)",
406406
pcmk__s(request->op, ""));
407407
return NULL;
408408
}

daemons/pacemakerd/pcmkd_messages.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ handle_unknown_request(pcmk__request_t *request)
153153
PCMK__XE_ACK, NULL, CRM_EX_PROTOCOL);
154154

155155
pcmk__format_result(&request->result, CRM_EX_PROTOCOL, PCMK_EXEC_INVALID,
156-
"Unknown IPC request type '%s' (bug?)",
156+
"Unknown request type '%s' (bug?)",
157157
pcmk__s(request->op, ""));
158158
return NULL;
159159
}

daemons/schedulerd/schedulerd_messages.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ handle_unknown_request(pcmk__request_t *request)
190190
PCMK__XE_ACK, NULL, CRM_EX_PROTOCOL);
191191

192192
pcmk__format_result(&request->result, CRM_EX_PROTOCOL, PCMK_EXEC_INVALID,
193-
"Unknown IPC request type '%s' (bug?)",
193+
"Unknown request type '%s' (bug?)",
194194
pcmk__s(request->op, ""));
195195
return NULL;
196196
}

0 commit comments

Comments
 (0)