Commit 0229d5f8 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Add "Heartbeat" to the start of several heartbeat messages. 

Closes #40322.
parent 2dfa19a8

changes/ticket40322

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features (logging):

    - Edit heartbeat log messages so that more of them begin with the string

      "Heartbeat: ".  Closes ticket 40322; patch from 'cypherpunks'.

src/core/or/dos.c

+2 −1
Original line number Diff line number Diff line
@@ -819,7 +819,8 @@ dos_log_heartbeat(void) 


  char *msg = smartlist_join_strings(elems, ", ", 0, NULL);



  log_notice(LD_HEARTBEAT, "DoS mitigation since startup: %s.", msg);

  log_notice(LD_HEARTBEAT,

             "Heartbeat: DoS mitigation since startup: %s.", msg);



  tor_free(msg);

  SMARTLIST_FOREACH(elems, char *, e, tor_free(e));

src/core/or/status.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ log_onion_service_stats(void) 
  }



  log_notice(LD_HEARTBEAT,

             "Our onion service%s received %u v3 INTRODUCE2 cells "

             "Heartbeat: Our onion service%s received %u v3 INTRODUCE2 cells "

             "and attempted to launch %d rendezvous circuits.",

             num_services == 1 ? "" : "s",

             hs_stats_get_n_introduce2_v3_cells(),

src/test/test_status.c

+2 −2
Original line number Diff line number Diff line
@@ -359,8 +359,8 @@ test_status_hb_not_in_consensus(void *arg) 
                 "initiated 0 and received 0 v3 connections; "

                 "initiated 0 and received 0 v4 connections; "

                 "initiated 0 and received 0 v5 connections.\n");

  expect_log_msg("DoS mitigation since startup: 0 circuits killed with "

                 "too many cells, [DoSCircuitCreationEnabled disabled], "

  expect_log_msg("Heartbeat: DoS mitigation since startup: 0 circuits killed "

                 "with too many cells, [DoSCircuitCreationEnabled disabled], "

                 "[DoSConnectionEnabled disabled], "

                 "[DoSRefuseSingleHopClientRendezvous disabled], "

                 "0 INTRODUCE2 rejected.\n");