Skip to content

Commit

Permalink
Tweak clang-format settings and reformat some source files
Browse files Browse the repository at this point in the history
  • Loading branch information
janbuchar committed Apr 5, 2018
1 parent dcee3d1 commit ebc9044
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: true
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: false
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
Expand Down
9 changes: 4 additions & 5 deletions src/handlers/broker_handler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ broker_handler::broker_handler(std::shared_ptr<const broker_config> config,
process_client_eval(identity, message, respond);
});

client_commands_.register_command(
"get-runtime-stats", [this](const std::string &identity, const std::vector<std::string> &message, response_cb respond) {
client_commands_.register_command("get-runtime-stats",
[this](const std::string &identity, const std::vector<std::string> &message, response_cb respond) {
process_client_get_runtime_stats(identity, message, respond);
});

Expand Down Expand Up @@ -472,9 +472,8 @@ bool broker_handler::check_failure_count(worker::request_ptr request,
{
if (request->failure_count >= config_->get_max_request_failures()) {
status_notifier.job_failed(request->data.get_job_id(),
"Job was reassigned too many (" + std::to_string(request->failure_count - 1) + ") times. Last"
" failure message was: " +
failure_msg);
"Job was reassigned too many (" + std::to_string(request->failure_count - 1) +
") times. Last failure message was: " + failure_msg);
notify_monitor(request, "FAILED", respond);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/curl.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ namespace helpers
/** Describes circumstances which lead to throwing this exception. */
std::string what_;
};
}
} // namespace helpers


#endif // RECODEX_BROKER_HELPERS_CURL_H
2 changes: 1 addition & 1 deletion src/helpers/logger.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace helpers
* @return difference
*/
int compare_log_levels(spdlog::level::level_enum first, spdlog::level::level_enum second);
}
} // namespace helpers


#endif // RECODEX_BROKER_HELPERS_LOGGER_H
2 changes: 1 addition & 1 deletion src/helpers/string_to_hex.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace helpers
* @return textual description of hexadecimal characters from given string
*/
std::string string_to_hex(const std::string &string);
}
} // namespace helpers


#endif // RECODEX_BROKER_STRING_TO_HEX_H

0 comments on commit ebc9044

Please sign in to comment.