Merge pull request #963 from andrevmatos/webui

Add small timeout on web3 test request
raiden-network · Sep 1, 2017 · 724ae44 · 724ae44
2 parents 012f5c4 + 49156f6
commit 724ae44
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/raiden/ui/web/src/app/services/raiden.config.ts b/raiden/ui/web/src/app/services/raiden.config.ts
@@ -34,14 +34,18 @@ export class RaidenConfig {
                 .subscribe((config) => {
                     this.config = Object.assign({}, default_config, config);
                     this.api = this.config.raiden;
-                    this.web3 = new Web3(new Web3.providers.HttpProvider(this.config.web3));
+                    this.web3 = new Web3(new Web3.providers.HttpProvider(this.config.web3, 2000));
                     // make a simple test call to web3
                     this.web3.version.getNetwork((err, res) => {
                         if (err) {
                             console.error('Invalid web3 endpoint', err);
                             console.info('Switching to fallback: ' + this.config.web3_fallback);
                             this.config.web3 = this.config.web3_fallback;
                             this.web3 = new Web3(new Web3.providers.HttpProvider(this.config.web3));
+                        } else {
+                            // on success, reconstruct without timeout,
+                            // because of long (events) running requests
+                            this.web3 = new Web3(new Web3.providers.HttpProvider(this.config.web3));
                         }
                         resolve();
                     });