diff options
| author | liuxueli <[email protected]> | 2020-11-12 18:14:47 +0600 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-11-12 18:14:47 +0600 |
| commit | 4c4f04f683878425120fab6edef146ea72577977 (patch) | |
| tree | fcdd8179a432a88047ca37b7ecd8c9dfb1b76fe8 /src/MESA_field_stat.cpp | |
| parent | 733221512e56f64441d93e8ca2b8e4a10e51589a (diff) | |
| parent | f8e845a45ab4952a7e293090fac4ef2a76678013 (diff) | |
Merge branch 'add-output-prometheus'v2.9.6
# Conflicts:
# src/MESA_field_stat.cpp
# src/fs2prometheus.cpp
Diffstat (limited to 'src/MESA_field_stat.cpp')
| -rw-r--r-- | src/MESA_field_stat.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/MESA_field_stat.cpp b/src/MESA_field_stat.cpp index 0f562aa..383ad50 100644 --- a/src/MESA_field_stat.cpp +++ b/src/MESA_field_stat.cpp @@ -538,10 +538,7 @@ void FS_start(screen_stat_handle_t handle) pthread_create(&(_handle->cfg_mon_t), NULL, fs2_thread_screen_print, (void*)handle); } - if(_handle->output_prometheus==1) - { - FS_library_promethues_register(handle); - } + FS_library_promethues_register(handle); return; } |