You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/01/19 15:39:03 UTC
[2/4] incubator-brooklyn git commit: Set error logging for MySqlNode
Set error logging for MySqlNode
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/12128ff7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/12128ff7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/12128ff7
Branch: refs/heads/master
Commit: 12128ff76fabfe596b0b473bbecf5f41378d8bb3
Parents: 981f7c7
Author: Valentin Aitken <va...@cloudsoftcorp.com>
Authored: Mon Jan 18 15:04:18 2016 +0200
Committer: Valentin Aitken <va...@cloudsoftcorp.com>
Committed: Mon Jan 18 18:01:08 2016 +0200
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/database/mysql/MySqlNode.java | 3 +++
.../org/apache/brooklyn/entity/database/mysql/mysql.conf | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12128ff7/brooklyn-library/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
----------------------------------------------------------------------
diff --git a/brooklyn-library/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java b/brooklyn-library/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
index 6306956..5003d4d 100644
--- a/brooklyn-library/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
+++ b/brooklyn-library/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
@@ -75,6 +75,9 @@ public interface MySqlNode extends SoftwareProcess, HasShortName, DatastoreCommo
@SetFromFlag("socketUid")
StringAttributeSensorAndConfigKey SOCKET_UID = new StringAttributeSensorAndConfigKey(
"mysql.socketUid", "Socket uid, for use in file /tmp/mysql.sock.<uid>.3306 (or randomly generated if not set)", null);
+
+ @SetFromFlag("generalLog")
+ ConfigKey GENERAL_LOG = ConfigKeys.newBooleanConfigKey("mysql.general_log", "Enable general log", false);
/** @deprecated since 0.7.0 use DATASTORE_URL */ @Deprecated
AttributeSensor<String> MYSQL_URL = DATASTORE_URL;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12128ff7/brooklyn-library/software/database/src/main/resources/org/apache/brooklyn/entity/database/mysql/mysql.conf
----------------------------------------------------------------------
diff --git a/brooklyn-library/software/database/src/main/resources/org/apache/brooklyn/entity/database/mysql/mysql.conf b/brooklyn-library/software/database/src/main/resources/org/apache/brooklyn/entity/database/mysql/mysql.conf
index 85f55ab..faabfa3 100644
--- a/brooklyn-library/software/database/src/main/resources/org/apache/brooklyn/entity/database/mysql/mysql.conf
+++ b/brooklyn-library/software/database/src/main/resources/org/apache/brooklyn/entity/database/mysql/mysql.conf
@@ -13,6 +13,10 @@ socket = /tmp/mysql.sock.${entity.socketUid}.${driver.port?c}
basedir = ${driver.baseDir}
datadir = ${driver.dataDir}
bind-address = 0.0.0.0
+log_error = ${driver.runDir}/mysql_error_${entity.getId()}.log
+log_warnings = 2
+general_log = ${config["mysql.general_log"]?string('on','off')}
+general_log_file = ${driver.runDir}/mysql_general_${entity.getId()}.log
# skip-networking
# Custom configuration options