mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
hs: Remove hamrless BUG() that can happen
When reloading a service, we can re-register a service and thus end up again in the metrics store initialization code path which is fine. No need to BUG() anymore. Fixes #40334 Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
parent
49ce31b2b6
commit
f93ccb8d24
3
changes/ticket40334
Normal file
3
changes/ticket40334
Normal file
@ -0,0 +1,3 @@
|
||||
o Minor bugfixes (onion service):
|
||||
- Remove a harmless BUG() warning when reloading tor configured with onion
|
||||
services. Fixes bug 40334; bugfix on 0.4.5.1-alpha.
|
@ -149,9 +149,11 @@ hs_metrics_service_init(hs_service_t *service)
|
||||
{
|
||||
tor_assert(service);
|
||||
|
||||
/* Calling this function twice on a service object is wrong. The caller must
|
||||
* free the metrics before if so. */
|
||||
if (BUG(service->metrics.store)) {
|
||||
/* This function is called when we register a service and so it could either
|
||||
* be a new service or a service that was just reloaded through a HUP signal
|
||||
* for instance. Thus, it is possible that the service has already an
|
||||
* initialized store. If so, just return. */
|
||||
if (service->metrics.store) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -197,7 +197,9 @@ register_service(hs_service_ht *map, hs_service_t *service)
|
||||
if (map == hs_service_map) {
|
||||
hs_service_map_has_changed();
|
||||
}
|
||||
/* Setup metrics. */
|
||||
/* Setup metrics. This is done here because in order to initialize metrics,
|
||||
* we require tor to have fully initialized a service so the ports of the
|
||||
* service can be looked at for instance. */
|
||||
hs_metrics_service_init(service);
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user