good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
5ac875b0
Commit
5ac875b0
authored
Aug 22, 2014
by
Jeffrey Wilcke
Browse files
Options
Downloads
Patches
Plain Diff
Set log level of std logger as well. (since gui logging is disabled)
parent
842f2cc8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
ethereal/gui.go
+3
-1
3 additions, 1 deletion
ethereal/gui.go
ethereal/main.go
+2
-1
2 additions, 1 deletion
ethereal/main.go
ethereum/main.go
+1
-0
1 addition, 0 deletions
ethereum/main.go
utils/cmd.go
+6
-2
6 additions, 2 deletions
utils/cmd.go
with
12 additions
and
4 deletions
ethereal/gui.go
+
3
−
1
View file @
5ac875b0
...
@@ -57,6 +57,7 @@ type Gui struct {
...
@@ -57,6 +57,7 @@ type Gui struct {
plugins
map
[
string
]
plugin
plugins
map
[
string
]
plugin
miner
*
ethminer
.
Miner
miner
*
ethminer
.
Miner
stdLog
ethlog
.
LogSystem
}
}
// Create GUI, but doesn't start it
// Create GUI, but doesn't start it
...
@@ -559,6 +560,7 @@ func (gui *Gui) ToggleTurboMining() {
...
@@ -559,6 +560,7 @@ func (gui *Gui) ToggleTurboMining() {
// functions that allow Gui to implement interface ethlog.LogSystem
// functions that allow Gui to implement interface ethlog.LogSystem
func
(
gui
*
Gui
)
SetLogLevel
(
level
ethlog
.
LogLevel
)
{
func
(
gui
*
Gui
)
SetLogLevel
(
level
ethlog
.
LogLevel
)
{
gui
.
logLevel
=
level
gui
.
logLevel
=
level
gui
.
stdLog
.
SetLogLevel
(
level
)
gui
.
config
.
Save
(
"loglevel"
,
level
)
gui
.
config
.
Save
(
"loglevel"
,
level
)
}
}
...
...
This diff is collapsed.
Click to expand it.
ethereal/main.go
+
2
−
1
View file @
5ac875b0
...
@@ -25,7 +25,7 @@ func run() error {
...
@@ -25,7 +25,7 @@ func run() error {
utils
.
InitDataDir
(
Datadir
)
utils
.
InitDataDir
(
Datadir
)
utils
.
InitLogging
(
Datadir
,
LogFile
,
LogLevel
,
DebugFile
)
stdLog
:=
utils
.
InitLogging
(
Datadir
,
LogFile
,
LogLevel
,
DebugFile
)
db
:=
utils
.
NewDatabase
()
db
:=
utils
.
NewDatabase
()
err
:=
utils
.
DBSanityCheck
(
db
)
err
:=
utils
.
DBSanityCheck
(
db
)
...
@@ -53,6 +53,7 @@ func run() error {
...
@@ -53,6 +53,7 @@ func run() error {
}
}
gui
:=
NewWindow
(
ethereum
,
config
,
clientIdentity
,
KeyRing
,
LogLevel
)
gui
:=
NewWindow
(
ethereum
,
config
,
clientIdentity
,
KeyRing
,
LogLevel
)
gui
.
stdLog
=
stdLog
utils
.
RegisterInterrupt
(
func
(
os
.
Signal
)
{
utils
.
RegisterInterrupt
(
func
(
os
.
Signal
)
{
gui
.
Stop
()
gui
.
Stop
()
...
...
This diff is collapsed.
Click to expand it.
ethereum/main.go
+
1
−
0
View file @
5ac875b0
...
@@ -43,6 +43,7 @@ func main() {
...
@@ -43,6 +43,7 @@ func main() {
err
:=
utils
.
DBSanityCheck
(
db
)
err
:=
utils
.
DBSanityCheck
(
db
)
if
err
!=
nil
{
if
err
!=
nil
{
logger
.
Errorln
(
err
)
logger
.
Errorln
(
err
)
os
.
Exit
(
1
)
os
.
Exit
(
1
)
}
}
...
...
This diff is collapsed.
Click to expand it.
utils/cmd.go
+
6
−
2
View file @
5ac875b0
...
@@ -100,18 +100,22 @@ func InitDataDir(Datadir string) {
...
@@ -100,18 +100,22 @@ func InitDataDir(Datadir string) {
}
}
}
}
func
InitLogging
(
Datadir
string
,
LogFile
string
,
LogLevel
int
,
DebugFile
string
)
{
func
InitLogging
(
Datadir
string
,
LogFile
string
,
LogLevel
int
,
DebugFile
string
)
ethlog
.
LogSystem
{
var
writer
io
.
Writer
var
writer
io
.
Writer
if
LogFile
==
""
{
if
LogFile
==
""
{
writer
=
os
.
Stdout
writer
=
os
.
Stdout
}
else
{
}
else
{
writer
=
openLogFile
(
Datadir
,
LogFile
)
writer
=
openLogFile
(
Datadir
,
LogFile
)
}
}
ethlog
.
AddLogSystem
(
ethlog
.
NewStdLogSystem
(
writer
,
log
.
LstdFlags
,
ethlog
.
LogLevel
(
LogLevel
)))
sys
:=
ethlog
.
NewStdLogSystem
(
writer
,
log
.
LstdFlags
,
ethlog
.
LogLevel
(
LogLevel
))
ethlog
.
AddLogSystem
(
sys
)
if
DebugFile
!=
""
{
if
DebugFile
!=
""
{
writer
=
openLogFile
(
Datadir
,
DebugFile
)
writer
=
openLogFile
(
Datadir
,
DebugFile
)
ethlog
.
AddLogSystem
(
ethlog
.
NewStdLogSystem
(
writer
,
log
.
LstdFlags
,
ethlog
.
DebugLevel
))
ethlog
.
AddLogSystem
(
ethlog
.
NewStdLogSystem
(
writer
,
log
.
LstdFlags
,
ethlog
.
DebugLevel
))
}
}
return
sys
}
}
func
InitConfig
(
ConfigFile
string
,
Datadir
string
,
EnvPrefix
string
)
*
ethutil
.
ConfigManager
{
func
InitConfig
(
ConfigFile
string
,
Datadir
string
,
EnvPrefix
string
)
*
ethutil
.
ConfigManager
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment