Skip to content

Commit

Permalink
plugin: move flux_respond () to end of functions
Browse files Browse the repository at this point in the history
Problem: There are a couple callbacks in the plugin that call
flux_respond () before they are done processing.

Move these calls to just before the functions call "return".
  • Loading branch information
cmoussa1 committed Mar 18, 2024
1 parent b8d960c commit 5c24d21
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/plugins/mf_priority.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,6 @@ static void rec_update_cb (flux_t *h,
goto error;
}

if (flux_respond (h, msg, NULL) < 0)
flux_log_error (h, "flux_respond");

if (!data || !json_is_array (data)) {
flux_log (h, LOG_ERR, "mf_priority: invalid bulk_update payload");
goto error;
Expand Down Expand Up @@ -259,6 +256,8 @@ static void rec_update_cb (flux_t *h,
users_def_bank[uid] = def_bank;
}

if (flux_respond (h, msg, NULL) < 0)
flux_log_error (h, "flux_respond");

Check warning on line 260 in src/plugins/mf_priority.cpp

View check run for this annotation

Codecov / codecov/patch

src/plugins/mf_priority.cpp#L260

Added line #L260 was not covered by tests
return;
error:
flux_respond_error (h, msg, errno, flux_msg_last_error (msg));
Expand All @@ -284,9 +283,6 @@ static void rec_q_cb (flux_t *h,
goto error;
}

if (flux_respond (h, msg, NULL) < 0)
flux_log_error (h, "flux_respond");

if (!data || !json_is_array (data)) {
flux_log (h, LOG_ERR, "mf_priority: invalid queue info payload");
goto error;
Expand Down Expand Up @@ -317,6 +313,8 @@ static void rec_q_cb (flux_t *h,
q->priority = priority;
}

if (flux_respond (h, msg, NULL) < 0)
flux_log_error (h, "flux_respond");

Check warning on line 317 in src/plugins/mf_priority.cpp

View check run for this annotation

Codecov / codecov/patch

src/plugins/mf_priority.cpp#L317

Added line #L317 was not covered by tests
return;
error:
flux_respond_error (h, msg, errno, flux_msg_last_error (msg));
Expand Down

0 comments on commit 5c24d21

Please sign in to comment.