Skip to content

Commit 8a9fd50

Browse files
Stewart Milescopybara-github
authored andcommitted
Add support for log files.
PiperOrigin-RevId: 378952727 Change-Id: I99aeb24a817582f36c66b866594a9de084c99ff3
1 parent 751f19f commit 8a9fd50

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

service/api/falken_service.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ def main(argv):
233233
if len(argv) > 1:
234234
logging.error('Non-flag parameters are not allowed: %s', argv)
235235
logging.debug('Starting the API service...')
236+
logging.get_absl_handler().use_absl_log_file()
236237
server = serve()
237238
server.wait_for_termination()
238239

service/launcher.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ def run_api(current_path: str):
102102
args = [
103103
sys.executable, '-m', 'api.falken_service', '--root_dir', FLAGS.root_dir,
104104
'--port', str(FLAGS.port), '--ssl_dir', FLAGS.ssl_dir,
105-
'--verbosity', str(FLAGS.verbosity), '--alsologtostderr'
105+
'--verbosity', str(FLAGS.verbosity), '--alsologtostderr',
106+
'--log_dir', FLAGS.log_dir,
106107
]
107108
for hyperparameters in FLAGS.hyperparameters:
108109
args.extend(['--hyperparameters', hyperparameters])
@@ -125,7 +126,7 @@ def run_learner(current_path: str):
125126
return subprocess.Popen(
126127
[sys.executable, '-m', 'learner.learner_service',
127128
'--root_dir', FLAGS.root_dir, '--verbosity', str(FLAGS.verbosity),
128-
'--alsologtostderr'],
129+
'--alsologtostderr', '--log_dir', FLAGS.log_dir],
129130
env=os.environ, cwd=current_path)
130131

131132

@@ -144,6 +145,7 @@ def main(argv):
144145
if len(argv) > 1:
145146
logging.error('Non-flag parameters are not allowed.')
146147

148+
logging.get_absl_handler().use_absl_log_file()
147149
check_ssl()
148150

149151
file_dir = os.path.dirname(os.path.abspath(__file__))

service/launcher_test.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import tempfile
2222
from unittest import mock
2323

24+
from absl import logging
2425
from absl.testing import absltest
2526
import common.generate_protos # pylint: disable=unused-import
2627
import launcher
@@ -37,6 +38,7 @@ def setUp(self):
3738
os.makedirs(launcher.FLAGS.ssl_dir)
3839
launcher.FLAGS.root_dir = os.path.join(self.temp_dir.name, 'root_dir')
3940
os.makedirs(launcher.FLAGS.root_dir)
41+
logging.FLAGS.log_dir = self.temp_dir
4042

4143
def tearDown(self):
4244
"""Tear down the testing environment."""
@@ -55,6 +57,7 @@ def test_run_api_test(self, popen):
5557
'--root_dir', launcher.FLAGS.root_dir, '--port', '50051',
5658
'--ssl_dir', launcher.FLAGS.ssl_dir,
5759
'--verbosity', '0', '--alsologtostderr',
60+
'--log_dir', self.temp_dir,
5861
'--hyperparameters', '{"foo": 1}',
5962
'--hyperparameters', '{"bar": 1000}'],
6063
env=os.environ, cwd='mock_path')
@@ -81,7 +84,7 @@ def test_run_learner_test(self, popen):
8184
popen.assert_called_once_with(
8285
[sys.executable, '-m', 'learner.learner_service',
8386
'--root_dir', launcher.FLAGS.root_dir, '--verbosity', '0',
84-
'--alsologtostderr'],
87+
'--alsologtostderr', '--log_dir', self.temp_dir],
8588
env=os.environ, cwd='mock_path')
8689

8790

service/learner/learner_service.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
from absl import app
2525
from absl import flags
26+
from absl import logging
2627
from data_store import data_store as data_store_module
2728
from data_store import file_system as data_store_file_system
2829
from learner import learner as learner_module
@@ -137,6 +138,7 @@ def shutdown(self):
137138

138139
def main(unused_argv, assignment_path=None, iterations=-1):
139140
"""Start a learner from the module's flags."""
141+
logging.get_absl_handler().use_absl_log_file()
140142
service = LearnerService(assignment_path)
141143
# Gracefully shut down when handling SIGTERM.
142144
signal.signal(signal.SIGTERM,

0 commit comments

Comments
 (0)