[icinga-checkins] icinga.org: icinga-core/master: update Changelog and config updates for refs #3533

[git at icinga.org]

Module: icinga-core
Branch: master
Commit: 4ffd523f80a2a983ad1e3672df5227296e7d4bdd
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=4ffd523f80a2a983ad1e3672df5227296e7d4bdd

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Wed Jan 16 21:27:09 2013 +0100

update Changelog and config updates for refs #3533

---

 Changelog                                          |    5 ++++-
 .../config/updates/ido2db.cfg_added_1.8_to_1.9.cfg |   11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 317eec9..f4e41b2 100644
--- a/Changelog
+++ b/Changelog
@@ -26,6 +26,7 @@ ENHANCEMENTS
 * classic ui: Added process status to JSON response #3172 - RB
 
 * idoutils: use transactions for large object dumps, opt-in config option #3527 - GB
+* idoutils: add experimental socket queue proxy; opt-in via config option #3533 - GB
 
 FIXES
 * core: fix faulty macro cleaning, replacing spaces with pluses where they shouldn't be cleaned #3397 - MF
@@ -66,7 +67,9 @@ CHANGES
 * core: -v param can be used more than once #3510
 * core: 'Warning: Host ... has no service associated with it!' now happens only in icinga -vv icinga.cfg #3510
 
-* ido2db.cfg - use_transactions #3527
+* ido2db.cfg:
+	** use_transactions #3527
+	** enable_socket_queue #3533
 
 
 1.8.3 - 12/12/2012
diff --git a/module/idoutils/config/updates/ido2db.cfg_added_1.8_to_1.9.cfg b/module/idoutils/config/updates/ido2db.cfg_added_1.8_to_1.9.cfg
index 0007efa..89ea5a8 100644
--- a/module/idoutils/config/updates/ido2db.cfg_added_1.8_to_1.9.cfg
+++ b/module/idoutils/config/updates/ido2db.cfg_added_1.8_to_1.9.cfg
@@ -18,6 +18,17 @@
 
 use_transactions=0
 
+# ENABLE SOCKET QUEUE - EXPERIMENTAL!
+# This setting enables a socket queue which will proxy the data received
+# from ido socket and the data(base) actions.
+# Values: 0 = disabled, 1 = enabled
+#
+# WARNING: This setting is highly experimental and may cause data loss on
+# your system if enabled. This is especially harmful when dumping the config
+# during core reload/restart. If problems occur, explicitely tell that you
+# are using this feature. You've been warned.
+
+enable_socket_queue=0