Skip to content

Commit 2b7e5e1

Browse files
committed
Minor fixes.
1 parent 41ec2c2 commit 2b7e5e1

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/backend/backend_ga4.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@ def _send_func(request_data):
2222
pass # nosec
2323

2424
def is_docker():
25-
from pathlib import Path
26-
cgroup = Path('/proc/self/cgroup')
27-
return Path('/.dockerenv').is_file() or cgroup.is_file() and 'docker' in cgroup.read_text()
25+
def text_in_file(text, filename):
26+
try:
27+
with open(filename, encoding='utf-8') as lines:
28+
return any(text in line for line in lines)
29+
except OSError:
30+
return False
31+
cgroup = '/proc/self/cgroup'
32+
return os.path.exists('/.dockerenv') or text_in_file('docker', cgroup)
2833

2934
class GA4Backend(TelemetryBackend):
3035
id = 'ga4'

src/backend/backend_ga4_test.py

-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,5 @@ def test_new_cid_priority_over_old_file(self):
105105
def test_is_docker(self):
106106
from .backend_ga4 import is_docker
107107
run_from_docker = "DOCKER_RUN" in os.environ and os.environ["DOCKER_RUN"].lower() == "true"
108-
print("os.environ {}".format(os.environ["DOCKER_RUN"]))
109-
print("is docker {}".format(is_docker()))
110108

111109
self.assertTrue(run_from_docker == is_docker())

0 commit comments

Comments
 (0)