Skip to content

Commit 7152bd8

Browse files
author
Vasileios Karakasis
authored
Merge branch 'master' into feat/default-max-jobs
2 parents fe497da + 2ab91d3 commit 7152bd8

File tree

2 files changed

+40
-2
lines changed

2 files changed

+40
-2
lines changed

docs/manpage.rst

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
637637
================================== ==================
638638

639639

640-
.. envvar:: RFM_GRAYLOG_SERVER
640+
.. envvar:: RFM_GRAYLOG_ADDRESS
641641

642642
The address of the Graylog server to send performance logs.
643643
The address is specified in ``host:port`` format.
@@ -651,6 +651,15 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
651651
================================== ==================
652652

653653

654+
.. versionadded:: 3.1
655+
656+
657+
.. envvar:: RFM_GRAYLOG_SERVER
658+
659+
.. deprecated:: 3.1
660+
Please :envvar:`RFM_GRAYLOG_ADDRESS` instead.
661+
662+
654663
.. envvar:: RFM_IGNORE_CHECK_CONFLICTS
655664

656665
Ignore tests with conflicting names when loading.
@@ -807,6 +816,23 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
807816
================================== ==================
808817

809818

819+
.. envvar:: RFM_SYSLOG_ADDRESS
820+
821+
The address of the Syslog server to send performance logs.
822+
The address is specified in ``host:port`` format.
823+
If no port is specified, the address refers to a UNIX socket.
824+
825+
.. table::
826+
:align: left
827+
828+
================================== ==================
829+
Associated command line option N/A
830+
Associated configuration parameter :js:attr:`address` syslog log handler configuration parameter
831+
================================== ==================
832+
833+
834+
.. versionadded:: 3.1
835+
810836
.. envvar:: RFM_SYSTEM
811837

812838
Set the current system.

reframe/frontend/cli.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,16 @@ def main():
347347
# Options not associated with command-line arguments
348348
argparser.add_argument(
349349
dest='graylog_server',
350-
envvar='RFM_GRAYLOG_SERVER',
350+
envvar='RFM_GRAYLOG_ADDRESS',
351351
configvar='logging/handlers_perflog/graylog_address',
352352
help='Graylog server address'
353353
)
354+
argparser.add_argument(
355+
dest='syslog_address',
356+
envvar='RFM_SYSLOG_ADDRESS',
357+
configvar='logging/handlers_perflog/syslog_address',
358+
help='Syslog server address'
359+
)
354360
argparser.add_argument(
355361
dest='ignore_reqnodenotavail',
356362
envvar='RFM_IGNORE_REQNODENOTAVAIL',
@@ -386,6 +392,12 @@ def main():
386392
printer = PrettyPrinter()
387393
printer.colorize = site_config.get('general/0/colorize')
388394
printer.inc_verbosity(site_config.get('general/0/verbose'))
395+
if os.getenv('RFM_GRAYLOG_SERVER'):
396+
printer.warning(
397+
'RFM_GRAYLOG_SERVER environment variable is deprecated; '
398+
'please use RFM_GRAYLOG_ADDRESS instead'
399+
)
400+
os.environ['RFM_GRAYLOG_ADDRESS'] = os.getenv('RFM_GRAYLOG_SERVER')
389401

390402
if options.upgrade_config_file is not None:
391403
old_config, *new_config = options.upgrade_config_file.split(

0 commit comments

Comments
 (0)