fix(httpclient): can't use runInBackground in agent (#3003)

eggjs · Sep 14, 2018 · a8a3dfb · a8a3dfb
1 parent 4faf68f
commit a8a3dfb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/lib/core/dnscache_httpclient.js b/lib/core/dnscache_httpclient.js
@@ -89,9 +89,7 @@ class DNSCacheHttpClient extends HttpClient {
       if (now - record.timestamp >= this.dnsCacheLookupInterval) {
         // make sure next request don't refresh dns query
         record.timestamp = now;
-        this.app.runInBackground(async () => {
-          await this[UPDATE_DNS](hostname, args);
-        });
+        this[UPDATE_DNS](hostname, args).catch(err => this.app.emit('error', err));
       }
 
       return { url: formatDnsLookupUrl(hostname, url, record.ip), args };

diff --git a/test/lib/core/dnscache_httpclient.test.js b/test/lib/core/dnscache_httpclient.test.js
@@ -182,6 +182,34 @@ describe('test/lib/core/dnscache_httpclient.test.js', () => {
     assert(timestamp !== record.timestamp);
   });
 
+  it('should cache and update with agent', async () => {
+    const agent = app._agent;
+    mm(dns, 'lookup', async () => [ '127.0.0.1' ]);
+
+    let obj = urlparse(url + '/get_headers');
+    let result = await agent.curl(obj, { dataType: 'json' });
+    assert(result.status === 200);
+    assert(result.data.host === host);
+    let record = agent.httpclient.dnsCache.get('localhost');
+    const timestamp = record.timestamp;
+    assert(record);
+
+    obj = urlparse(url + '/get_headers');
+    result = await agent.curl(obj, { dataType: 'json' });
+    assert(result.status === 200);
+    assert(result.data.host === host);
+    record = agent.httpclient.dnsCache.get('localhost');
+    assert(timestamp === record.timestamp);
+
+    await sleep(5000);
+    obj = urlparse(url + '/get_headers');
+    result = await agent.curl(obj, { dataType: 'json' });
+    assert(result.status === 200);
+    assert(result.data.host === host);
+    record = agent.httpclient.dnsCache.get('localhost');
+    assert(timestamp !== record.timestamp);
+  });
+
   it('should not cache ip', async () => {
     const obj = urlparse(url.replace('localhost', '127.0.0.1') + '/get_headers');
     const result = await app.curl(obj, { dataType: 'json' });