فهرست منبع

[3] fix(logging): report definition hashes as hex

Review: definition hashes should be logged as hex.
Resolution: the thirteen hash fields now print as zero-padded 32-bit
hex.

Definition hashes are identifiers, not counts, and every other identity
in these lines already prints as hex. Printing them as decimal made log
lines impossible to match against extracted content by eye.

Switches definition_hash, material_set_hash, previous_hash and
requested_hash. Every argument was already std::uint32_t, so this is a
format change only. Definition indices stay decimal because they are
ordinals into the installed tables, not hashes.

Thomas Shields 3 هفته پیش
والد
کامیت
7354a30554

+ 1 - 1
Sunrise/src/server/bap/encrypted/encrypted_runtime.cpp

@@ -300,7 +300,7 @@ bool consume(Session& session,
                     line.data(),
                     line.size(),
                     "ev=profile_acquire stage=output_publish result=ok framed_bytes=%zu "
-                    "queuez_published=%u family_version=%d residents=%u definition_hash=%u "
+                    "queuez_published=%u family_version=%d residents=%u definition_hash=0x%08X "
                     "quantity=%d instance=0x%llX action_source=%u appended_row=%u "
                     "appended_resident=%u",
                     framedSize,

+ 3 - 3
Sunrise/src/server/bap/encrypted/push/snapshot/family4_inventory_updates.cpp

@@ -155,7 +155,7 @@ bool prepare_profile_item_acquisition(Scratch& scratch,
         std::snprintf(line.data(),
                       line.size(),
                       "ev=profile_acquire stage=account_object result=ok family_version=%d "
-                      "account=0x%llX definition=%u item_count=%zu definition_hash=%u quantity=%d "
+                      "account=0x%llX definition=%u item_count=%zu definition_hash=0x%08X quantity=%d "
                       "native_row=%zu mutation_serial=%d change_slot=%u change_next_sequence=%u "
                       "change_kind=%u account_payload_bytes=%zu objects=%zu object_order=%s",
                       acquisition.after.family4Version,
@@ -399,7 +399,7 @@ bool prepare_item_acquisition(Scratch& scratch,
         line.size(),
         "ev=acquire stage=family4_objects result=ok family_version=%d root=0x%llX "
         "character=0x%llX character_definition=%u instance=0x%llX item_definition=%u "
-        "definition_hash=%u inventory_row=%u equipment_slot=%u next_serial=%u objects=%zu "
+        "definition_hash=0x%08X inventory_row=%u equipment_slot=%u next_serial=%u objects=%zu "
         "order=%s new_item_flag=1 watermark=1 acquired_row_serial=%d "
         "inventory_change_write_slot=%u inventory_change_next_sequence=%u "
         "inventory_change_record=0 inventory_change_sequence=%u "
@@ -606,7 +606,7 @@ bool prepare_item_dismantle(Scratch& scratch,
                       line.size(),
                       "ev=dismantle stage=family4_objects result=ok family_version=%d root=0x%llX "
                       "character=0x%llX character_definition=%u instance=0x%llX item_definition=%u "
-                      "definition_hash=%u inventory_index=%zu inventory_row=%u equipment_slot=%u "
+                      "definition_hash=0x%08X inventory_index=%zu inventory_row=%u equipment_slot=%u "
                       "moved_items=%zu items_after=%zu next_serial=%u rewards=%zu objects=%zu "
                       "order=%s",
                       dismantle.after.family4Version,

+ 1 - 1
Sunrise/src/server/bap/encrypted/push/snapshot/family4_selection_move.cpp

@@ -490,7 +490,7 @@ bool prepare_socket_plug(Scratch& scratch,
         "ev=socket_plug stage=family4_objects result=ok family_version=%d root=0x%llX "
         "character=0x%llX instance=0x%llX item_definition=%u target_definition=%u "
         "target_bucket=%u lane=%u plug_definition=%u plug_bucket=%u equipped=%u "
-        "material_set=%u material_set_hash=%u material_rows=%u account_update=%u objects=%zu "
+        "material_set=%u material_set_hash=0x%08X material_rows=%u account_update=%u objects=%zu "
         "order=%s",
         socketPlug.after.family4Version,
         static_cast<unsigned long long>(socketPlug.after.family4RootSoid),

+ 3 - 3
Sunrise/src/server/web_service/web_service_actions.cpp

@@ -115,7 +115,7 @@ void report_profile_item_acquisition_response(const middleware::web_service::Mes
         std::snprintf(line.data(),
                       line.size(),
                       "ev=profile_acquire stage=response result=ok opcode=%u transaction=%u "
-                      "family_version=%d definition_hash=%u quantity=%d bytes=%zu hex=",
+                      "family_version=%d definition_hash=0x%08X quantity=%d bytes=%zu hex=",
                       static_cast<unsigned>(message.opcode),
                       static_cast<unsigned>(message.transactionId),
                       family4Version,
@@ -571,7 +571,7 @@ void report_item_dismantle(const middleware::web_service::Message& message,
         line.data(),
         line.size(),
         "ev=ws402 stage=prepare result=%.*s reason=%.*s transaction=%u payload_bytes=%zu "
-        "instance=0x%llX definition_index=%u definition_hash=%u quantity=%u",
+        "instance=0x%llX definition_index=%u definition_hash=0x%08X quantity=%u",
         static_cast<int>(result.size()),
         result.data(),
         static_cast<int>(reason.size()),
@@ -690,7 +690,7 @@ void report_item_acquisition(const middleware::web_service::Message& message,
         line.data(),
         line.size(),
         "ev=ws1820 stage=prepare result=%.*s reason=%.*s transaction=%u payload_bytes=%zu "
-        "collectible_index=%u item_definition_index=%u definition_hash=%u instance=0x%llX",
+        "collectible_index=%u item_definition_index=%u definition_hash=0x%08X instance=0x%llX",
         static_cast<int>(result.size()),
         result.data(),
         static_cast<int>(reason.size()),

+ 4 - 4
Sunrise/src/state/runtime/state_account_runtime.cpp

@@ -51,7 +51,7 @@ void report_equipment(std::string_view stage,
         line.size(),
         "ev=equip operation=%.*s stage=%.*s result=%.*s character=0x%llX previous=0x%llX "
         "requested=0x%llX equipment_index=%zu inventory_index=%zu native_slot=%u "
-        "moved_items=%zu previous_hash=%u requested_hash=%u",
+        "moved_items=%zu previous_hash=0x%08X requested_hash=0x%08X",
         static_cast<int>(operation.size()),
         operation.data(),
         static_cast<int>(stage.size()),
@@ -89,7 +89,7 @@ void report_acquisition(std::string_view stage,
     const int count = std::snprintf(
         line.data(),
         line.size(),
-        "ev=acquire stage=%.*s result=%.*s reason=%.*s definition_hash=%u character=0x%llX "
+        "ev=acquire stage=%.*s result=%.*s reason=%.*s definition_hash=0x%08X character=0x%llX "
         "instance=0x%llX inventory_index=%zu inventory_row=%u equipment_slot=%u next_serial=%u",
         static_cast<int>(stage.size()),
         stage.data(),
@@ -128,7 +128,7 @@ void report_profile_acquisition(std::string_view stage,
     const int count =
         std::snprintf(line.data(),
                       line.size(),
-                      "ev=profile_acquire stage=%.*s result=%.*s reason=%.*s definition_hash=%u "
+                      "ev=profile_acquire stage=%.*s result=%.*s reason=%.*s definition_hash=0x%08X "
                       "account=0x%llX instance=0x%llX bucket=%u profile_index=%zu item_count=%zu "
                       "quantity_before=%d "
                       "quantity_after=%d appended=%u",
@@ -580,7 +580,7 @@ void report_dismantle(std::string_view stage,
     const int count =
         std::snprintf(line.data(),
                       line.size(),
-                      "ev=dismantle stage=%.*s result=%.*s reason=%.*s definition_hash=%u "
+                      "ev=dismantle stage=%.*s result=%.*s reason=%.*s definition_hash=0x%08X "
                       "character=0x%llX instance=0x%llX inventory_index=%zu inventory_row=%u "
                       "equipment_slot=%u moved_items=%zu next_serial=%u",
                       static_cast<int>(stage.size()),