Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
zistvan-public
StreamChain Prototype
Commits
d8636618
Commit
d8636618
authored
May 17, 2018
by
Gari Singh
Committed by
Gerrit Code Review
May 17, 2018
Browse files
Merge "[FAB-10132] Align outlier peer CLI success msg log lvl"
parents
6f550524
fab5d976
Changes
4
Hide whitespace changes
Inline
Side-by-side
integration/runner/peer_test.go
View file @
d8636618
...
...
@@ -162,7 +162,6 @@ var _ = Describe("Peer", func() {
By
(
"fetch channel block file"
)
fetchRun
:=
components
.
Peer
()
fetchRun
.
ConfigDir
=
tempDir
fetchRun
.
LogLevel
=
"debug"
fetchRun
.
MSPConfigPath
=
filepath
.
Join
(
cryptoDir
,
"peerOrganizations"
,
"org1.example.com"
,
"users"
,
"Admin@org1.example.com"
,
"msp"
)
fRunner
:=
fetchRun
.
FetchChannel
(
"mychan"
,
filepath
.
Join
(
tempDir
,
"mychan.block"
),
"0"
,
"127.0.0.1:8050"
)
execute
(
fRunner
)
...
...
integration/world/config.go
View file @
d8636618
...
...
@@ -216,7 +216,6 @@ func (w *World) SetupChannel() error {
p
=
w
.
Components
.
Peer
()
p
.
ConfigDir
=
filepath
.
Join
(
w
.
Rootpath
,
"org1.example.com_0"
)
p
.
LogLevel
=
"debug"
p
.
MSPConfigPath
=
filepath
.
Join
(
w
.
Rootpath
,
"crypto"
,
"peerOrganizations"
,
"org1.example.com"
,
"users"
,
"Admin@org1.example.com"
,
"msp"
)
adminRunner
:=
p
.
CreateChannel
(
w
.
Deployment
.
Channel
,
filepath
.
Join
(
w
.
Rootpath
,
fmt
.
Sprintf
(
"%s_tx.pb"
,
w
.
Deployment
.
Channel
)),
w
.
Deployment
.
Orderer
)
execute
(
adminRunner
)
...
...
@@ -225,7 +224,6 @@ func (w *World) SetupChannel() error {
for
peer
:=
0
;
peer
<
peerOrg
.
PeerCount
;
peer
++
{
p
=
w
.
Components
.
Peer
()
peerDir
:=
fmt
.
Sprintf
(
"%s_%d"
,
peerOrg
.
Domain
,
peer
)
p
.
LogLevel
=
"debug"
p
.
ConfigDir
=
filepath
.
Join
(
w
.
Rootpath
,
peerDir
)
p
.
MSPConfigPath
=
filepath
.
Join
(
w
.
Rootpath
,
"crypto"
,
"peerOrganizations"
,
peerOrg
.
Domain
,
"users"
,
fmt
.
Sprintf
(
"Admin@%s"
,
peerOrg
.
Domain
),
"msp"
)
adminRunner
=
p
.
FetchChannel
(
w
.
Deployment
.
Channel
,
filepath
.
Join
(
w
.
Rootpath
,
peerDir
,
fmt
.
Sprintf
(
"%s_block.pb"
,
w
.
Deployment
.
Channel
)),
"0"
,
w
.
Deployment
.
Orderer
)
...
...
peer/chaincode/install.go
View file @
d8636618
...
...
@@ -84,7 +84,7 @@ func install(msg proto.Message, cf *ChaincodeCmdFactory) error {
}
if
proposalResponse
!=
nil
{
logger
.
Debug
f
(
"Installed remotely %v"
,
proposalResponse
)
logger
.
Info
f
(
"Installed remotely %v"
,
proposalResponse
)
}
return
nil
...
...
peer/channel/deliverclient.go
View file @
d8636618
...
...
@@ -108,10 +108,10 @@ func (r *deliverClient) readBlock() (*common.Block, error) {
switch
t
:=
msg
.
Type
.
(
type
)
{
case
*
ab
.
DeliverResponse_Status
:
logger
.
Debug
f
(
"Got status: %v"
,
t
)
logger
.
Info
f
(
"Got status: %v"
,
t
)
return
nil
,
fmt
.
Errorf
(
"can't read the block: %v"
,
t
)
case
*
ab
.
DeliverResponse_Block
:
logger
.
Debug
f
(
"Received block: %v"
,
t
.
Block
.
Header
.
Number
)
logger
.
Info
f
(
"Received block: %v"
,
t
.
Block
.
Header
.
Number
)
r
.
client
.
Recv
()
// Flush the success message
return
t
.
Block
,
nil
default
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment