Skip to content

Commit 38cf62e

Browse files
FAB-8564 align docs with log level of sample
FAB-8564 against fabric-samples changed the default logging level to INFO. Add note to request user to change this to DEBUG for purposes of manual tutorial to align doc with expected output. Change-Id: Ia0abc6d810e69991666e65764aa8d570bea44129 Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
1 parent 2f401c6 commit 38cf62e

File tree

2 files changed

+37
-5
lines changed

2 files changed

+37
-5
lines changed

docs/source/build_network.rst

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Respond with a ``y`` or hit the return key:
170170
.. code:: bash
171171
172172
Starting with channel 'mychannel' and CLI timeout of '10'
173-
Continue? [Y/n]
173+
Continue? [Y/n]
174174
proceeding ...
175175
Creating network "net_byfn" with the default driver
176176
Creating peer0.org1.example.com
@@ -196,10 +196,6 @@ completion, it should report the following in your terminal window:
196196

197197
.. code:: bash
198198
199-
2017-05-16 17:08:01.366 UTC [msp] GetLocalMSP -> DEBU 004 Returning existing local MSP
200-
2017-05-16 17:08:01.366 UTC [msp] GetDefaultSigningIdentity -> DEBU 005 Obtaining default signing identity
201-
2017-05-16 17:08:01.366 UTC [msp/identity] Sign -> DEBU 006 Sign: plaintext: 0AB1070A6708031A0C08F1E3ECC80510...6D7963631A0A0A0571756572790A0161
202-
2017-05-16 17:08:01.367 UTC [msp/identity] Sign -> DEBU 007 Sign: digest: E61DB37F4E8B0D32C9FE10E3936BA9B8CD278FAA1F3320B08712164248285C54
203199
Query Result: 90
204200
2017-05-16 17:08:15.158 UTC [main] main -> INFO 008 Exiting.....
205201
===================== Query on peer1.org2 on channel 'mychannel' is successful =====================
@@ -248,6 +244,24 @@ If you'd like to learn more about the underlying tooling and bootstrap mechanics
248244
continue reading. In these next sections we'll walk through the various steps
249245
and requirements to build a fully-functional Hyperledger Fabric network.
250246

247+
.. note:: The manual steps outlined below assume that the ``CORE_LOGGING_LEVEL`` in
248+
the CLI container is set to ``DEBUG``. You can set this by modifying
249+
the ``docker-compose-cli.yaml`` file in the ``first-network`` directory.
250+
e.g.
251+
252+
.. code::
253+
254+
cli:
255+
container_name: cli
256+
image: hyperledger/fabric-tools:$IMAGE_TAG
257+
tty: true
258+
stdin_open: true
259+
environment:
260+
- GOPATH=/opt/gopath
261+
- CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
262+
- CORE_LOGGING_LEVEL=DEBUG
263+
#- CORE_LOGGING_LEVEL=INFO
264+
251265
Crypto Generator
252266
----------------
253267

docs/source/channel_update_tutorial.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,24 @@ show you each command for making a channel update and what it does.
105105
Bring Org3 into the Channel Manually
106106
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
107107

108+
.. note:: The manual steps outlined below assume that the ``CORE_LOGGING_LEVEL`` in
109+
the CLI container is set to ``DEBUG``. You can set this by modifying
110+
the ``docker-compose-org3.yaml`` file in the ``first-network`` directory.
111+
e.g.
112+
113+
.. code::
114+
115+
Org3cli:
116+
container_name: Org3cli
117+
image: hyperledger/fabric-tools:$IMAGE_TAG
118+
tty: true
119+
stdin_open: true
120+
environment:
121+
- GOPATH=/opt/gopath
122+
- CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
123+
#- CORE_LOGGING_LEVEL=INFO
124+
- CORE_LOGGING_LEVEL=DEBUG
125+
108126
If you've used the ``eyfn.sh`` script, you'll need to bring your network down.
109127
This can be done by issuing:
110128

0 commit comments

Comments
 (0)