You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2016/06/28 20:38:55 UTC
[1/2] qpid-dispatch git commit: NO-JIRA: Minor doc clarification READ
vs. QUERY.
Repository: qpid-dispatch
Updated Branches:
refs/heads/master c0be15664 -> fa6fafabf
NO-JIRA: Minor doc clarification READ vs. QUERY.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/34040b4c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/34040b4c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/34040b4c
Branch: refs/heads/master
Commit: 34040b4c8c8aabd6339e243c18e1becf7668510b
Parents: c0be156
Author: Alan Conway <ac...@redhat.com>
Authored: Tue Jun 28 10:02:35 2016 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Jun 28 16:36:05 2016 -0400
----------------------------------------------------------------------
doc/man/qdmanage.8.adoc | 24 ++++++++++------------
python/qpid_dispatch/management/qdrouter.json | 2 +-
2 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/34040b4c/doc/man/qdmanage.8.adoc
----------------------------------------------------------------------
diff --git a/doc/man/qdmanage.8.adoc b/doc/man/qdmanage.8.adoc
index 1d4d6a4..ae9bb59 100644
--- a/doc/man/qdmanage.8.adoc
+++ b/doc/man/qdmanage.8.adoc
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License
////
-qmanage(8)
+qdmanage(8)
==========
:doctype: manpage
@@ -45,9 +45,10 @@ OPERATIONS
----------
`query` ['ATTR'...]::
- Print the attributes named in the ATTR list or all attributes if none
- are listed. Print attributes for all entities by default, use --type,
- --name and --identity options to restrict what is printed.
+ Print attributes for multiple entities. Prints all entities by default, use
+ --type, --name or --identity options to restrict which entities are printed.
+ Prints the attributes named in the ATTR list, or all attributes if none are
+ listed.
`create` ['ATTR=VALUE'...]::
Create a new entity with the specified attributes. With the --stdin
@@ -56,17 +57,14 @@ OPERATIONS
multiple entities.
`read`::
- Print the attributes of an entity specified by the --name or
- --identity options. With the --stdin option, create entities based on
- data from stdin. This can be a JSON map of attributes to create a
- single entity, or a JSON list of maps to create multiple entities.
+ Print all the attributes of a single entity, specified by the --name or
+ --identity options.
`update` ['ATTR=VALUE'...]::
- Update the attributes of an existing entity. With the --stdin option,
- read attributes from stdin. This can be a JSON map of attributes to
- update a single entity, or a JSON list of maps to update multiple
- entities. If an ATTR name is listed with no =VALUE, that attribute
- will be deleted from the entity.
+ Update the attributes of an existing entity. If an ATTR name is listed with
+ no =VALUE, that attribute will be deleted from the entity. With the --stdin
+ option, read attributes from stdin. This can be a JSON map of attributes to
+ update a single entity, or a JSON list of maps to update multiple entities.
`delete`::
Delete an entity specified by the --name or --identity options.
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/34040b4c/python/qpid_dispatch/management/qdrouter.json
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json
index 3e45374..1e6f513 100644
--- a/python/qpid_dispatch/management/qdrouter.json
+++ b/python/qpid_dispatch/management/qdrouter.json
@@ -166,7 +166,7 @@
}
},
"READ": {
- "description": "Read attributes of an entity",
+ "description": "Read attributes of a single entity",
"request": {
"properties": {
"name": {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-dispatch git commit: DISPATCH-412: Support 'stdout' as log
destination as well as 'stderr'
Posted by ac...@apache.org.
DISPATCH-412: Support 'stdout' as log destination as well as 'stderr'
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/fa6fafab
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/fa6fafab
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/fa6fafab
Branch: refs/heads/master
Commit: fa6fafabf4c1d6fe2a4ee2794932b9f4adbc1802
Parents: 34040b4
Author: Alan Conway <ac...@redhat.com>
Authored: Tue Jun 28 10:10:32 2016 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Jun 28 16:36:09 2016 -0400
----------------------------------------------------------------------
src/log.c | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fa6fafab/src/log.c
----------------------------------------------------------------------
diff --git a/src/log.c b/src/log.c
index 4cd52c8..3e5aca6 100644
--- a/src/log.c
+++ b/src/log.c
@@ -79,6 +79,7 @@ DEQ_DECLARE(log_sink_t, log_sink_list_t);
static log_sink_list_t sink_list = {0};
+static const char* SINK_STDOUT = "stdout";
static const char* SINK_STDERR = "stderr";
static const char* SINK_SYSLOG = "syslog";
static const char* SOURCE_DEFAULT = "DEFAULT";
@@ -118,6 +119,9 @@ static log_sink_t* log_sink_lh(const char* name) {
if (strcmp(name, SINK_STDERR) == 0) {
file = stderr;
}
+ else if (strcmp(name, SINK_STDOUT) == 0) {
+ file = stdout;
+ }
else if (strcmp(name, SINK_SYSLOG) == 0) {
openlog(0, 0, LOG_DAEMON);
syslog = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org