Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Upstream CI #175

Open
wants to merge 1 commit into
base: 1110
Choose a base branch
from
Open

Fix Upstream CI #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dump_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ void createPEL(
// Implies this is a call from Manager. Hence we need to make an async
// call to avoid deadlock with Phosphor-logging.
auto retVal =
busMethod.call_async([&](sdbusplus::message::message&& reply) {
busMethod.call_async([&](const sdbusplus::message::message& reply) {
if (reply.is_method_error())
{
log<level::ERR>("Error in calling async method to create PEL");
lg2::error("Error in calling async method to create PEL");
}
});
if (!retVal)
{
log<level::ERR>("Return object contains null pointer");
lg2::error("Return object contains null pointer");
}
}
catch (const sdbusplus::exception::SdBusError& e)
Expand Down
21 changes: 8 additions & 13 deletions dump_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,29 +423,24 @@ inline uint64_t timeToEpoch(std::string timeStr)
* @return Returns void
*/
void createPEL(
sdbusplus::bus::bus& dBus, const std::string& pelSev,
const std::string& errIntf,
const std::unordered_map<std::string_view, std::string_view>& userDataMap);
sdbusplus::bus::bus& dBus, std::string& pelSev, std::string& errIntf,
std::unordered_map<std::string_view, std::string_view>& userDataMap);
/**
* @brief Create a new PEL message for dump Delete/Offload
* @brief Create a new PEL message for dump Delete
*
* @param[in] dBus - Handle to D-Bus object
* @param[in] pelSev - PEL severity (Informational by default)
* @param[in] errIntf - D-Bus interface name.
* @param[in] dumpFilePath - Deleted/Offloaded dump file path/name
* @param[in] dumpFileType - Deleted/Offloaded dump file type
* (BMC/Resource/System)
* @param[in] dumpFilePath - Deleted dump file path/name
* @param[in] dumpFileType - Deleted dump file type (BMC/Resource/System)
* @param[in] dumpId - The dump ID
* @return Returns void
*
* Note: Passing by value as this has an async call
*/
void createPELOnDumpActions(sdbusplus::bus::bus& dBus,
const std::string dumpFilePath,
const std::string dumpFileType,
const std::string dumpId, const std::string pelSev,
const std::string errIntf);
void createPELOnDumpActions(sdbusplus::bus::bus& dBus, std::string dumpFilePath,
std::string dumpFileType, std::string dumpId,
std::string pelSev, std::string errIntf);
#endif

} // namespace dump
} // namespace phosphor