summaryrefslogtreecommitdiff
path: root/qpid/tools/src
Commit message (Collapse)AuthorAgeFilesLines
* Changed opts.force_if_not_used to opts.force_if_used.Jonathan Robie2011-04-181-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1094727 13f79535-47bb-0310-9956-ffa450edef68
* Fixes two errors in options:Jonathan Robie2011-04-151-2/+2
| | | | | | | | 1. Text for option -a / --broker-adr was wrong. 2. Name of --force-if-used was wrong. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1092780 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3190: always try to eval() quoted tokensGordon Sim2011-04-081-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1090170 13f79535-47bb-0310-9956-ffa450edef68
* Corrected help text for --max-queue-size, --max-queue-countJonathan Robie2011-04-011-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1087706 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3169: add usage message if command is unknown.Kenneth Anthony Giusti2011-03-241-0/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1085147 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3101: better handling of different argument types for qpid-toolGordon Sim2011-03-021-1/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1076282 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3103: handle null argumentsGordon Sim2011-03-021-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1076275 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3091: fix for older versions of pythonGordon Sim2011-03-011-1/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1075935 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3091: add generic mechanism for adding and listing queue argumentsGordon Sim2011-03-011-1/+17
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1075889 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: fix qpid-printevents to work on python 2.4.Alan Conway2011-03-011-14/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1075862 13f79535-47bb-0310-9956-ffa450edef68
* What was a single test -- sasl_fed_ex -- is nowMichael Goulish2011-02-281-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4 tests with a common core. They are: sasl_fed_ex_dynamic sasl_fed_ex_link sasl_fed_ex_queue sasl_fed_ex_route ( and the common core is sasl_fed_ex ) These tests correspond to the 4 different ways that the qpid-route command has of making links, or links+routes. All those pathways have to be modified so that the new "mechanism" argument information can be passed down and used -- so that you can specify a SASL mechnism to be used on the interbroker link that you create. ( So -- the qpid-route command also had to be modified to propagate the mechanism info with all 4 subcommands. ) Since the SASL mechanism is owned by the link, these tests check that the link comes up and becomes operational. Finally, I modified the sasl-mechanism flag in qpid-route to call it "client-sasl-mechanism" to better distinguish between the SASL mechanism used in the created route -- and the SASL mechanism (if any) that is used when the qpid-route client itself connects to the broker that it is talking to. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1075452 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3087: fail rather than ignoring attempts to declare queues with bad ↵Gordon Sim2011-02-251-9/+9
| | | | | | arguments; ensure qpid-config can deal with different types of argument. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1074697 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2935: merge producer flow control (C++ broker).Kenneth Anthony Giusti2011-02-191-0/+38
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1072356 13f79535-47bb-0310-9956-ffa450edef68
* Add some generated files to .gitignore.Alan Conway2011-02-101-12/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1069553 13f79535-47bb-0310-9956-ffa450edef68
* Improve exception reporting for queries and method calls.Ted Ross2011-02-041-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1067091 13f79535-47bb-0310-9956-ffa450edef68
* Add detection of negative numbers to the method-argument evaluator.Ted Ross2011-02-031-2/+5
| | | | | | | Note: This logic is getting a bit hairy, it should be replaced with a regular expression match. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1066725 13f79535-47bb-0310-9956-ffa450edef68
* Improve the detection of data types in command-line method arguments.Ted Ross2011-02-021-1/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1066564 13f79535-47bb-0310-9956-ffa450edef68
* qpid-route now correctly shows usage for invalid command lines.Jonathan Robie2011-01-222-97/+106
| | | | | | | Fixes an error introduced by an earlier commit. Also modified qpid-config for consistency. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1062221 13f79535-47bb-0310-9956-ffa450edef68
* Usability changes:Ted Ross2011-01-101-17/+45
| | | | | | | | | 1) Improved exception reporting. 2) Changed query structure to keep query results until 'clear' command is invoked. 3) Use 'list' and 'show' in a more intuitive way. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1057356 13f79535-47bb-0310-9956-ffa450edef68
* fix syntax error in qpid-routeKenneth Anthony Giusti2011-01-101-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1057332 13f79535-47bb-0310-9956-ffa450edef68
* Code cleanup:Ted Ross2011-01-101-216/+30
| | | | | | | | 1) Removed dead code. 2) Cleaned up command completion and handling of incorrect number of arguments. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1057316 13f79535-47bb-0310-9956-ffa450edef68
* A new command-line tool, similar to qpid-tool but with the following ↵Ted Ross2011-01-101-0/+830
| | | | | | | | | | | differences: 1) Operation is active and synchronous, rather than passive and async. 2) Operations are per-agent (i.e. work with one agent at a time). 3) Uses the new QMFv2 API (Python wrapper around C++ core). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1057208 13f79535-47bb-0310-9956-ffa450edef68
* Prints connection error information.Jonathan Robie2011-01-101-0/+4
| | | | | | | Previously, connection errors were silently ignored. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1057195 13f79535-47bb-0310-9956-ffa450edef68
* qpid-tool throws Charles E. Rolke2011-01-061-0/+3
| | | | | | | | | | | TypeError(unsupported operand types for /: 'NoneType' and 'int',") when it shows a session.expireTime object with a missing value. Some values are optional and are normally missing. This patch prevents the exception and displays 'absent'. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1056076 13f79535-47bb-0310-9956-ffa450edef68
* Undo svn commit r1052086.Jonathan Robie2011-01-054-33/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1055655 13f79535-47bb-0310-9956-ffa450edef68
* Fixes typo in findById function declaration.Jonathan Robie2011-01-051-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1055632 13f79535-47bb-0310-9956-ffa450edef68
* Allow any SASL mechanism to be specified in command line options.Jonathan Robie2011-01-055-5/+6
| | | | | | | Previously used a fixed list of SASL mechanisms. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1055267 13f79535-47bb-0310-9956-ffa450edef68
* Added logging to QMF console connections.Jonathan Robie2010-12-224-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning if a broker can not be found, error if SASL authentication fails or other connection errors when connecting to an existing broker. Default log level is ERROR. qpid-printevents allows the log level to be set. It also allows the user to specify that a connection is required, in which case it terminates if a connection can not be established. Examples: $ ./qpid-printevents --sasl-mechanism PLAIN nonexistent-broker => Not an error. Waits for the broker to be started. $ ./qpid-printevents --sasl-mechanism PLAIN localhost 2010-12-22 17:07:18,365 ERROR Could not connect to broker localhost:5672 (None, 'No acceptable SASL authentication mechanism available') => Connection error condition in output - SASL authentication failed because user name and password are not supplied. But qpid-printevents keeps running, waiting for you to start the broker. $ ./qpid-printevents --sasl-mechanism PLAIN --log-level critical => Connection error condition in output - SASL authentication failed because user name and password are not supplied. No output in this case, because the log level has been set to critical. $ ./qpid-printevents --sasl-mechanism PLAIN --require-connection localhost 2010-12-22 17:11:03,791 ERROR Could not connect to broker localhost:5672 (None, 'No acceptable SASL authentication mechanism available') Failed: ConnectionFailed - (None, 'No acceptable SASL authentication mechanism available') => Connection error condition. qpid-printevents terminates because --require-connection was specified. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1052086 13f79535-47bb-0310-9956-ffa450edef68
* Allow command line utilities to require a given SASL mechanism.Jonathan Robie2010-12-215-91/+105
| | | | | | | | | | Useful if the client's most secure mechanism is suspect, e.g. if Kerberos configuration problems may exist. Also useful in a variety of test scenarios. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1051700 13f79535-47bb-0310-9956-ffa450edef68
* Made qpid-xxx management scripts callable as python functions.Jonathan Robie2010-12-176-606/+676
| | | | | | | | | | | | | | | | | | | | | Examples (from cli_tests.py): def qpid_config_api(self, arg = ""): script = import_script(checkenv("QPID_CONFIG_EXEC")) broker = ["-a", "localhost:"+str(self.broker.port)] return script.main(broker + arg.split()) def qpid_route_api(self, arg = ""): script = import_script(checkenv("QPID_ROUTE_EXEC")) return script.main(arg.split()) Useful primarily for qpid-config, qpid-route, and qpid-cluster. Probably not useful for qpid-stat, qpid-printevents, qpid-queue-stats, which just create screen output. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1050425 13f79535-47bb-0310-9956-ffa450edef68
* Modified qpid-cluster to support the way it is called from Jonathan Robie2010-12-101-4/+4
| | | | | | | | | | | | cluster_tests.StoreTests.test_persistent_partial_failure. Corrected test_persistent_partial_failure so that it no longer sends the name of the script as the first parameter - optparse expects this for arguments from sys.argv, but not for other argument lists. Fixed bug assigning host name. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1044468 13f79535-47bb-0310-9956-ffa450edef68
* Corrected datatypes of numeric defaults for optparse.Jonathan Robie2010-12-084-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1043599 13f79535-47bb-0310-9956-ffa450edef68
* Fix qpid-tool to not attempt to display parially-learned schemata.Ted Ross2010-12-081-7/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1043575 13f79535-47bb-0310-9956-ffa450edef68
* Print usage rather than help if user gets usage wrong.Jonathan Robie2010-12-061-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1042733 13f79535-47bb-0310-9956-ffa450edef68
* Restored Usage() function (lost in version skew shuffle)Jonathan Robie2010-12-061-9/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1042710 13f79535-47bb-0310-9956-ffa450edef68
* Fixes problem with unbound _args variable in bind.Jonathan Robie2010-12-061-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1042655 13f79535-47bb-0310-9956-ffa450edef68
* Converted tools to use optparse. Jonathan Robie2010-12-055-438/+380
| | | | | | | | | | Now all tools in this directory use optparse for their command lines, rather than a variety of different approaches. Simplifies option handling significantly. Doesn't simplify arguments list in qpid-route and qpid-config. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1042398 13f79535-47bb-0310-9956-ffa450edef68
* Add ASF licence to the git ignore filesRobert Gemmell2010-10-281-0/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1028476 13f79535-47bb-0310-9956-ffa450edef68
* SASLizing Interbroker LinksMichael Goulish2010-10-201-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ------------------------------------------------------------- 1. Brokers already knew how to handle the server side of SASLized links, but not the client side. So we promoted the client-side SASL code from the client library to the common library so that the broker could also use it. This affected SaslFactory.{h,cpp} and Sasl.h TODO -- can the server-side and client-side code be unified here? 2. Some of the SASL verbs in broker/ConnectionHandler.cpp are expanded: start, secure, tune. 3. broker/SecureConnection is altered to get the client-broker and the server-broker to agree on when the security layer should be inserted. 4. the python tool qpid-route is modified so that, in the "route add" command, you can specify the security mechanism for SASL to use. TODO -- should we also pass in {min,max}SSF ? 5. Changes in broker/LinkRegistry to allow the information input by qpid-route to be passed up to where it is needed. 6. A bash script test run by "make check" that creates a SASLized federation link and sends some messages down it. TODO - write a python unit test instead of a bash script. I think I uncovered a bug in the python code when I tried. 7. NOTE - testing for this feature does not work with versions of SASL earlier than 2.1.22, becuase I can't tell SASL to use a SASL database file in a nonstandard location. The test is disabled for earlier versions. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1024541 13f79535-47bb-0310-9956-ffa450edef68
* Fixed qpid-stat to skip rows when the underlying data disappears during ↵Ted Ross2010-09-221-14/+17
| | | | | | | | | execution. Removed keyword arg from "sort" to support Python 2.3. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@999918 13f79535-47bb-0310-9956-ffa450edef68
* Fix qpid-cluster-store tool for recent changes to UUID (see r995770)Gordon Sim2010-09-221-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@999841 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2842 - Fixed regression introduced in r992039.Ted Ross2010-09-171-0/+2
| | | | | | | Display correct object index in cases where a V2 agent supplied its own object name. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@998116 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2842 - Fixed inconsistent display of object ids in qpid-tool.Ted Ross2010-09-021-3/+61
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@992039 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2810: clean up the broker thread properly on shutdown.Kenneth Anthony Giusti2010-08-196-32/+75
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@987330 13f79535-47bb-0310-9956-ffa450edef68
* Return rather than exiting once route is deletedGordon Sim2010-08-021-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@981643 13f79535-47bb-0310-9956-ffa450edef68
* Added --cluster option to display per-broker detail for clusters.Kenneth Anthony Giusti2010-07-301-3/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@980766 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2762: display all class keys that match a given input tokens, not just ↵Kenneth Anthony Giusti2010-07-271-15/+17
| | | | | | the first match. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@979712 13f79535-47bb-0310-9956-ffa450edef68
* bugfix: convert v1 oid's when calling v2 agentKenneth Anthony Giusti2010-07-091-2/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@962526 13f79535-47bb-0310-9956-ffa450edef68
* Defer delivery of messages in cluster-unsafe context.Alan Conway2010-07-051-1/+3
| | | | | | | | | | | | | | | Messages enqueued in a cluster-safe context are synchronized across the cluster. However some messages are delivered in a cluster-unsafe context, for example raising a link established event occurs the connection thread of the establishing connection. This fix deferrs such messages by multicasting them so they can be re-delived in a cluster safe context. See https://bugzilla.redhat.com/show_bug.cgi?id=611543 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@960681 13f79535-47bb-0310-9956-ffa450edef68
* Fix to bug introduced in r959353 causing error when qpid-stat is run against ↵Gordon Sim2010-06-301-1/+2
| | | | | | standalone broker git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@959439 13f79535-47bb-0310-9956-ffa450edef68