| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 04e8b99d8195a0e39982ecd27802421610633724 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 16 Jun 2017 22:18:31 -0700 |
| 4 | Subject: [PATCH 4/6] engine: Fix indentation and missing semi-colon |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | lib/engine/mdadm_config.cpp | 5 +++-- |
| 11 | lib/engine/unique_id_manager.cpp | 2 +- |
| 12 | 2 files changed, 4 insertions(+), 3 deletions(-) |
| 13 | |
| 14 | diff --git a/lib/engine/mdadm_config.cpp b/lib/engine/mdadm_config.cpp |
| 15 | index 1914ddc..e40c2c7 100644 |
| 16 | --- a/lib/engine/mdadm_config.cpp |
| 17 | +++ b/lib/engine/mdadm_config.cpp |
| 18 | @@ -118,9 +118,10 @@ void check_configuration() |
| 19 | attr >> config; |
| 20 | configOk = correct_config(config); |
| 21 | } catch (Exception ex) { |
| 22 | - if (ex != E_NOT_FOUND) |
| 23 | + if (ex != E_NOT_FOUND) { |
| 24 | dlog("Warning: mdadm config file cannot be read, new one will be written"); |
| 25 | backup = false; |
| 26 | + } |
| 27 | } |
| 28 | |
| 29 | if (configOk && monitor_running()) { |
| 30 | @@ -134,7 +135,7 @@ void check_configuration() |
| 31 | dlog("Warning: failed to update mdadm.conf"); |
| 32 | } |
| 33 | if (restart_monitor() == 0) |
| 34 | - dlog("Monitor restarted successfully") |
| 35 | + dlog("Monitor restarted successfully"); |
| 36 | else |
| 37 | dlog("Error starting Monitor"); |
| 38 | } |
| 39 | diff --git a/lib/engine/unique_id_manager.cpp b/lib/engine/unique_id_manager.cpp |
| 40 | index 99c153c..87d6ddc 100644 |
| 41 | --- a/lib/engine/unique_id_manager.cpp |
| 42 | +++ b/lib/engine/unique_id_manager.cpp |
| 43 | @@ -185,7 +185,7 @@ void UniqueIdManager::refresh() |
| 44 | keyFile >> keyList; |
| 45 | keyList += "\n"; |
| 46 | } catch (...) { |
| 47 | - dlog("ssi.keys file missing") |
| 48 | + dlog("ssi.keys file missing"); |
| 49 | /* no file? that's ok */ |
| 50 | } |
| 51 | /* process the list to update IdCaches */ |
| 52 | -- |
| 53 | 2.13.1 |
| 54 | |