Skip to content

Commit efdf8e3

Browse files
committed
fix(logger): miss log
1 parent f564780 commit efdf8e3

3 files changed

Lines changed: 28 additions & 8 deletions

File tree

rootfs/api/models/gateway.py

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,17 @@ class Gateway(AuditedModel):
2525
name = models.CharField(max_length=63, db_index=True)
2626
ports = models.JSONField(default=list)
2727

28+
def log(self, message, level=logging.INFO):
29+
"""Logs a message in the context of this service.
30+
31+
This prefixes log messages with an application "tag" that the customized
32+
drycc-logspout will be on the lookout for. When it's seen, the message-- usually
33+
an application event of some sort like releasing or scaling, will be considered
34+
as "belonging" to the application instead of the controller and will be handled
35+
accordingly.
36+
"""
37+
logger.log(level, "[{}]: {}".format(self.app.id, message))
38+
2839
def add(self, port, protocol):
2940
# check port
3041
if not self._check_port(port, protocol):
@@ -126,8 +137,8 @@ def delete(self, *args, **kwargs):
126137
try:
127138
self.scheduler().gateways.delete(self.app.id, self.name, ignore_exception=False)
128139
except KubeException:
129-
logger.log(
130-
msg='Kubernetes gateway cannot be deleted: {}'.format(self.name),
140+
self.log(
141+
'Kubernetes gateway cannot be deleted: {}'.format(self.name),
131142
level=logging.ERROR,
132143
)
133144
return super().delete(*args, **kwargs)
@@ -225,6 +236,17 @@ def current_rules(self):
225236
return self.rules["canary"]
226237
return self.rules["stable"]
227238

239+
def log(self, message, level=logging.INFO):
240+
"""Logs a message in the context of this service.
241+
242+
This prefixes log messages with an application "tag" that the customized
243+
drycc-logspout will be on the lookout for. When it's seen, the message-- usually
244+
an application event of some sort like releasing or scaling, will be considered
245+
as "belonging" to the application instead of the controller and will be handled
246+
accordingly.
247+
"""
248+
logger.log(level, "[{}]: {}".format(self.app.id, message))
249+
228250
def check_rules(self):
229251
service = self.app.service_set.filter(
230252
procfile_type=self.procfile_type).first()
@@ -297,8 +319,8 @@ def delete(self, *args, **kwargs):
297319
k8s_route = getattr(self.scheduler(), self.kind.lower())
298320
k8s_route.delete(self.app.id, self.name, ignore_exception=False)
299321
except KubeException:
300-
logger.log(
301-
msg='Kubernetes {} cannot be deleted: {}'.format(self.kind.lower(), self.name),
322+
self.log(
323+
'Kubernetes {} cannot be deleted: {}'.format(self.kind.lower(), self.name),
302324
level=logging.ERROR,
303325
)
304326
return super().delete(*args, **kwargs)

rootfs/api/models/tls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ def refresh_certificate_to_k8s(self):
106106
version = data["metadata"]["resourceVersion"]
107107
self.scheduler().certificate.put(namespace, name, hosts, version)
108108
else:
109-
logger.log(
110-
msg="certificate {} does not exist".format(namespace), level=logging.INFO)
109+
self.log(
110+
"certificate {} does not exist".format(namespace), level=logging.INFO)
111111
self.scheduler().certificate.create(namespace, name, hosts)
112112
else:
113113
self.log("skip creating certificate, no domain name set", logging.WARNING)

rootfs/requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,4 @@ hiredis==2.3.2
2727
django_redis==5.4.0
2828
dj-database-url==2.1.0
2929
social-auth-app-django==5.4.1
30-
python-jose==3.3.0
31-
Authlib==1.3.0
3230
kubernetes==29.0.0

0 commit comments

Comments
 (0)