Bug 1739557 - Avoid warning about glean not loading when telemetry is disabled. r=mhentges

Differential Revision: https://phabricator.services.mozilla.com/D130438
This commit is contained in:
Mike Hommey 2021-11-08 22:53:53 +00:00
parent d907da5770
commit 4b9b98fb0f

View File

@ -53,17 +53,19 @@ def create_telemetry_from_environment(settings):
):
return NoopTelemetry(False)
is_enabled = is_telemetry_enabled(settings)
try:
from glean import Glean
except ImportError:
return NoopTelemetry(True)
return NoopTelemetry(is_enabled)
from pathlib import Path
Glean.initialize(
"mozilla.mach",
"Unknown",
is_telemetry_enabled(settings),
is_enabled,
data_dir=Path(get_state_dir()) / "glean",
)
return GleanTelemetry()