Skip to content

Commit 43da35d

Browse files
committed
fixes Remove extraneous whitespaces from all files
1 parent 425a359 commit 43da35d

File tree

138 files changed

+272
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+272
-364
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ jobs:
528528
run: |
529529
echo "coredump.%e.%p" > /proc/sys/kernel/core_pattern
530530
ulimit -c unlimited
531-
531+
532532
threads=12
533533
534534
ctest --timeout 1200 -V --output-junit=Testing/Test.xml --output-on-failure --no-compress-output -I ${{matrix.shard}},,${{matrix.shards}} -j${threads} ${{env.RouterCTestExtraArgs}}

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,22 @@ if(NOT DEFINED VERSION)
6767
OUTPUT_VARIABLE DEFAULT_VERSION
6868
RESULT_VARIABLE GIT_RESULT
6969
OUTPUT_STRIP_TRAILING_WHITESPACE)
70-
71-
70+
71+
7272
# You might sometimes get a fatal error when running the above command (when this is not a git repo).
7373
# GIT_RESULT will contain the result of last child process. It will be zero if successful.
7474
if (GIT_RESULT EQUAL 0)
7575
# Git succeeded, we will use the DEFAULT_VERSION as the QPID_DISPATCH_VERSION
7676
set(QPID_DISPATCH_VERSION ${DEFAULT_VERSION})
7777
else()
78-
# The git command failed, set QPID_DISPATCH_VERSION to "UNKNOWN"
78+
# The git command failed, set QPID_DISPATCH_VERSION to "UNKNOWN"
7979
set(QPID_DISPATCH_VERSION "UNKNOWN")
8080
endif(GIT_RESULT EQUAL 0)
8181
else(Git_FOUND)
8282
# Git executable was not available, we will not be able to determine the version, just set it to "UNKNOWN"
8383
set(QPID_DISPATCH_VERSION "UNKNOWN")
8484
endif(Git_FOUND)
85-
85+
8686
else(NOT DEFINED VERSION)
8787

8888
# What if VERSION is defined but someone passed in an empty value for VERSION? Deal with that case here.
@@ -95,7 +95,7 @@ else(NOT DEFINED VERSION)
9595
else()
9696
set(QPID_DISPATCH_VERSION ${VERSION})
9797
endif()
98-
endif(VERSION STREQUAL "")
98+
endif(VERSION STREQUAL "")
9999
endif(NOT DEFINED VERSION)
100100

101101
message(STATUS "Setting skupper-router version to ${QPID_DISPATCH_VERSION}")

README.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ From the `<build>` directory you can run all the system- and unit-tests with:
7474
$ ctest -VV
7575
----
7676

77-
The `ctest` tool uses the script `<build>/test/run.py` to set up the correct environment for tests.
77+
The `ctest` tool uses the script `<build>/test/run.py` to set up the correct environment for tests.
7878
You can use it to run tests individually from the `<build>/tests` directory.
7979

8080
.Example
@@ -177,8 +177,8 @@ And run the following command to generate grpc code:
177177
python -m grpc_tools.protoc -I. --python_out=. --grpc_python_out=. ./friendship.proto
178178
----
179179

180-
The system tests are implemented using Python's unittest library.
181-
This library is used to run the tests by default.
180+
The system tests are implemented using Python's unittest library.
181+
This library is used to run the tests by default.
182182
The tests can be also run using `xmlrunner` or `pytest`.
183183
Pytest can generate a JUnit-compatible XML report containing an entry for each Python test method.
184184
After running the tests, all XML reports can be found under `tests/junitxmls` in your build directory:
@@ -201,7 +201,7 @@ cmake .. -DQDROUTERD_RUNNER="gdb -quiet -iex 'set pagination off' -iex 'set debu
201201

202202
=== Test Suite Code Coverage (GNU tools only)
203203

204-
Use coverage analysis to ensure that all code paths are exercised by the test suite.
204+
Use coverage analysis to ensure that all code paths are exercised by the test suite.
205205
To run the tests and perform code coverage analysis:
206206

207207
. Install the lcov package
@@ -242,11 +242,11 @@ This script then does the following:
242242
The CTest test suite can be configured to enable extra run time
243243
validation checks against the skupper router.
244244

245-
Since run time validation slows down `skrouterd` considerably it is disabled by default.
245+
Since run time validation slows down `skrouterd` considerably it is disabled by default.
246246

247247
It can be enabled by setting the `RUNTIME_CHECK` build flag via the `cmake` command.
248248

249-
NOTE: Depending on your environment the `ctest` suite may time out if validation is enabled due to the additional run time overhead it adds.
249+
NOTE: Depending on your environment the `ctest` suite may time out if validation is enabled due to the additional run time overhead it adds.
250250
You can extend the default test time via the `ctest --timeout`
251251
option.
252252

@@ -261,7 +261,7 @@ The Skupper Router test suite supports the following run time validation tools:
261261
==== Valgrind Memcheck
262262

263263
Memcheck runs `skrouterd` under Valgrind's memcheck leak checker during the CTest suite.
264-
This causes tests to fail if a memory error is encountered.
264+
This causes tests to fail if a memory error is encountered.
265265
Use the grinder tool (in the bin directory) to create a summary of the errors found during the test run.
266266

267267
The valgrind toolset must be installed in order to use memcheck.
@@ -273,7 +273,7 @@ To enable memcheck set the RUNTIME_CHECK build flag to "memcheck":
273273
cmake .. -DRUNTIME_CHECK=memcheck
274274
----
275275

276-
If valgrind detects errors, the `skrouterd` process exits with an exit code of `42` and a message is displayed in the CTest output.
276+
If valgrind detects errors, the `skrouterd` process exits with an exit code of `42` and a message is displayed in the CTest output.
277277
For example:
278278

279279
[source]

bin/export.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121

2222
# export.sh - Create a release archive.
2323

24-
# run this script like this -
24+
# run this script like this -
2525
# Before executing this script, change directory to the folder in which this file is located, for example.
2626
# 1. cd /home/jdoe/skupper-router/bin
27-
# Run the script like so -
28-
# 2. ./export.sh <output_folder-full-path> <tag-name>
29-
# (Example : ./export.sh /home/jdoe/ 1.5.1
30-
# (/home/jdoe is the folder you want the tar.gz file to be put - specify the full path)
27+
# Run the script like so -
28+
# 2. ./export.sh <output_folder-full-path> <tag-name>
29+
# (Example : ./export.sh /home/jdoe/ 1.5.1
30+
# (/home/jdoe is the folder you want the tar.gz file to be put - specify the full path)
3131
# 1.5.1 is the tag name
3232
# A file named skupper-router-<tag-name>.tar.gz will be created at <output_folder-full-path>
3333

34-
# Simply running ./export.sh will put the tar.gz file in the current folder and use the very latest createed tag
34+
# Simply running ./export.sh will put the tar.gz file in the current folder and use the very latest createed tag
3535

3636
set -e
3737
trap "cleanup" 0 1 2 3 9 11 13 15

bin/find_ports.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,3 @@
2525
# With no dir search under current directory.
2626

2727
find "$@" -name '*.log' | xargs gawk 'match($0, /Listening on .* ([0-9]+)/, m) { print m[1] } match($0, /Configured Listener: .*:([0-9]+)/, m) { print m[1] }'
28-

bin/record-coverage.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,3 @@ lcov --remove dispatch-total-raw.info "/usr/include*" "/usr/share*" "${SRCPATH}/
7777
# Generate report
7878
rm -rf html
7979
genhtml -p $SRCPATH -p $BLDPATH dispatch-total.info --title "Dispatch Router Test Coverage" --demangle-cpp -o html
80-

docs/man/skmanage.8.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ SYNOPSIS
3131
3232
DESCRIPTION
3333
-----------
34-
An AMQP management client for use with the skupper-router daemon
35-
('skrouterd'). Sends AMQP management operations requests and prints
36-
the response in JSON format. This is a generic AMQP management tool
34+
An AMQP management client for use with the skupper-router daemon
35+
('skrouterd'). Sends AMQP management operations requests and prints
36+
the response in JSON format. This is a generic AMQP management tool
3737
and can be used with any AMQP endpoint that follows the AMQP Management
3838
specification, not just with 'skrouterd'.
3939

docs/notes/router-annotations.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,3 @@ Interior routers will include the full set of router annotations -
131131
including the ingress-router and trace list fields - on messages sent
132132
to an edge router. It is expected that the edge router can safely
133133
ignore the ingress-router and trace field values in this case.
134-

docs/notes/shutdown.adoc

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ How does the router shut down when interrupted with ctrl-C ?
3434
including itself as one of the worker threads.
3535

3636
... thread_run() +
37-
is in a loop processing batches of events, calling
37+
is in a loop processing batches of events, calling
3838
handle() on each event.
3939

4040
.... handle() +
@@ -43,9 +43,9 @@ How does the router shut down when interrupted with ctrl-C ?
4343
thread, and then returns 'false'.
4444

4545
... thread_run() receives false return from handle(), indicating
46-
that the thread is no longer running. It drops out of the
47-
running loop. If there is a connection, it calls
48-
qd_conn_event_batch_complete() with last arg false, indicating that
46+
that the thread is no longer running. It drops out of the
47+
running loop. If there is a connection, it calls
48+
qd_conn_event_batch_complete() with last arg false, indicating that
4949
the connection has not closed. It then calls pn_proactor_done()
5050
and returns, to be joined by qd_server_run().
5151

@@ -61,8 +61,8 @@ How does the router shut down when interrupted with ctrl-C ?
6161

6262
. main_process() +
6363
nulls out and dispatch pointer, and calls qd_dispatch_free().
64-
It then flushes any remaining content in stdout, disables its
65-
SIGINT handler, and sends SIGINT
64+
It then flushes any remaining content in stdout, disables its
65+
SIGINT handler, and sends SIGINT
6666
to itself, terminating the qdrouterd process.
6767

6868
.. qd_dispatch_free() +
@@ -126,9 +126,3 @@ How does the router shut down when interrupted with ctrl-C ?
126126

127127
... qd_alloc_finalize() +
128128
All allocated items should have been released by now, and there should be only a single thread running. No locking will be done. Clean up all items on the types list. Reclaim the items on the global free pool. Reclaim items on thread pools. Check stats to detect allocated items that have not been freed.
129-
130-
131-
132-
133-
134-

etc/sasl2/skrouterd.conf

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
#---------------------------------
2323
#
2424
# This default mech list allows for PLAIN, but that
25-
# mechanism sends credentials in the clear, and is normally
25+
# mechanism sends credentials in the clear, and is normally
2626
# only used along with SSL transport-layer security.
2727
#
2828
# This default also permits DIGEST-MD5, but you must have
2929
# a user and password defined in your sasldb file to use
3030
# this mechanism. ( See notes below. )
3131
#
32-
# PLEASE NOTE
32+
# PLEASE NOTE
3333
# For production messaging systems, a high-security mechanism such as
3434
# DIGEST-MD5 or PLAIN+SSL should be used.
3535
#
@@ -50,23 +50,23 @@ mech_list: ANONYMOUS DIGEST-MD5 EXTERNAL PLAIN
5050
# configuration attribute.
5151
#
5252
# If your nonstandard sasl directory is $MY_SASL_DIR, put a copy
53-
# of this file at $MY_SASL_DIR/skrouterd.conf, alter the mech list as
54-
# appropriate for your installation, and then use the saslpasswd2
53+
# of this file at $MY_SASL_DIR/skrouterd.conf, alter the mech list as
54+
# appropriate for your installation, and then use the saslpasswd2
5555
# command to add new user+passwd pairs:
5656
# echo $PASSWD | saslpasswd2 -c -p -f $MY_SASL_DIR/skrouterd.sasldb -u QPID $USERNAME
57-
#
5857
#
59-
# 2. The standard location for the skrouterd sasldb file is
58+
#
59+
# 2. The standard location for the skrouterd sasldb file is
6060
# /var/lib/skrouterd/skrouterd.sasldb
6161
#
6262
# 3. You can see what usernames have been stored in the sasldb, with the
6363
# command "sasldblistusers2 -f /var/lib/skrouterd/skrouterd.sasldb"
6464
#
6565
# 4. The sasldb file must be readable by the user running the skrouterd
66-
# daemon, ( the user name is skrouterd ) and should be readable only
66+
# daemon, ( the user name is skrouterd ) and should be readable only
6767
# by that user.
6868
#
69-
# 5. The EXTERNAL mechanism allows you to use SSL transport layer
69+
# 5. The EXTERNAL mechanism allows you to use SSL transport layer
7070
# security. In that case, you can also set the broker option
7171
# --ssl-require-client-authentication .
7272

@@ -75,6 +75,3 @@ mech_list: ANONYMOUS DIGEST-MD5 EXTERNAL PLAIN
7575
# The following line stops spurious 'sql_select option missing' errors when
7676
# cyrus-sql-sasl plugin is installed
7777
sql_select: dummy select
78-
79-
80-

0 commit comments

Comments
 (0)