diff options
| author | zelig <viktor.tron@gmail.com> | 2014-06-30 01:39:31 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-06-30 01:39:31 +0800 |
| commit | ce4080faa78238c2dc389070da4a376226f48833 (patch) | |
| tree | fff8756717b7cde1d5c4a2b0ec39f8ff766ef327 | |
| parent | cf7fcadeca356adf780d00583a16f0b722cc7987 (diff) | |
| parent | 328ee9a3ecb0e49f229eac5773c3a516cc4e17ce (diff) | |
| download | go-tangerine-ce4080faa78238c2dc389070da4a376226f48833.tar go-tangerine-ce4080faa78238c2dc389070da4a376226f48833.tar.gz go-tangerine-ce4080faa78238c2dc389070da4a376226f48833.tar.bz2 go-tangerine-ce4080faa78238c2dc389070da4a376226f48833.tar.lz go-tangerine-ce4080faa78238c2dc389070da4a376226f48833.tar.xz go-tangerine-ce4080faa78238c2dc389070da4a376226f48833.tar.zst go-tangerine-ce4080faa78238c2dc389070da4a376226f48833.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/keys
| -rwxr-xr-x[-rw-r--r--] | install.sh | 0 | ||||
| -rw-r--r-- | utils/cmd.go | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/install.sh b/install.sh index 9719a1afc..9719a1afc 100644..100755 --- a/install.sh +++ b/install.sh diff --git a/utils/cmd.go b/utils/cmd.go index d20af98cc..dc435a700 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -208,6 +208,10 @@ func StartMining(ethereum *eth.Ethereum) bool { miner = ethminer.NewDefaultMiner(addr, ethereum) // Give it some time to connect with peers time.Sleep(3 * time.Second) + for !ethereum.IsUpToDate() == false { + time.Sleep(5 * time.Second) + } + logger.Infoln("Miner started") miner := ethminer.NewDefaultMiner(addr, ethereum) miner.Start() |