From 4c3e3005aa3cc51117577b7846990db3600f7317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 1 Aug 2017 12:52:34 +0200
Subject: [PATCH] Apply asset fallback to database timeout errors

---
 lib/cartodb/server.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index 13d64804..7968dc5f 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -118,8 +118,27 @@ module.exports = function(serverOptions) {
     var onTileErrorStrategy;
     if (global.environment.enabledFeatures.onTileErrorStrategy !== false) {
         onTileErrorStrategy = function onTileErrorStrategy$TimeoutTile(err, tile, headers, stats, format, callback) {
-            if (err && err.message === 'Render timed out' && format === 'png') {
-                return callback(null, timeoutErrorTile, { 'Content-Type': 'image/png' }, {});
+
+            function isRenderTimeoutError (err) {
+                return err.message && (-1 !== err.message.indexOf('Render timed out'));
+            }
+
+            function isDatasourceTimeoutError (err) {
+                return err.message && (-1 !== err.message.indexOf('canceling statement due to statement timeout'));
+            }
+
+            function isTimeoutError (err) {
+                return isRenderTimeoutError(err) || isDatasourceTimeoutError(err);
+            }
+
+            function isRasterFormat (format) {
+                return format === 'png' || format === 'jpg'
+            }
+
+            if (isTimeoutError(err) && isRasterFormat(format)) {
+                return callback(null, timeoutErrorTile, {
+                    'Content-Type': 'image/png',
+                }, {});
             } else {
                 return callback(err, tile, headers, stats);
             }