Merge prod -> master

This commit is contained in:
Eric Harding committed 2018-10-25 17:17:52 -04:00
commit c34c99a874
214 files changed
+8482 -2931

No files matched your search

@@ -6,6 +6,7 @@
#include "lib/utils/PBUtils.h"
#include "lib/api/service_helpers/AdminServiceUtils.h"
#include "lib/orderman/orderman_utils/orderman_utils.h"
#include "lib/utils/TimeStamp.h"
#include <boost/tokenizer.hpp>
#include <fmt/format.h>
@@ -135,6 +136,7 @@ void AdminServiceServer::delete_account(
}
void AdminServiceServer::_update_and_publish(bool is_insert){
std::string ser_state;
auto start = utils::TimeStamp::now();
if (_state.SerializeToString(&ser_state))
{
LOG(Gen, Info, "Saving admin data");
@@ -145,7 +147,9 @@ void AdminServiceServer::_update_and_publish(bool is_insert){
_publisher.add_or_update(_state);
_publisher.flush();
_publish_md_entitlements();
_publish_md_permissions();
// _publish_md_permissions();
auto elapsed = (utils::TimeStamp::now() - start).milliseconds();
LOG(Gen, Info, "Saved admin data ({}ms)", elapsed);
}
else
LOG(Gen, Error, "Could not serialize admin data, saving failed");