From 6cd99f8bc9ca3855fb8a6302649dbeb6c3242c24 Mon Sep 17 00:00:00 2001
From: SeanWalsh95 <SeanWalsh95@users.noreply.github.com>
Date: Thu, 25 Feb 2021 12:37:20 -0500
Subject: [PATCH] try/catch axios request + set pulled flag

Wraps axios request with try/catch for cases where we do not get a response or get an error

sets `this.pulled` flag after receiving and parsing response
---
 squad-server/layers/layers.js | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/squad-server/layers/layers.js b/squad-server/layers/layers.js
index 607b733..e420981 100644
--- a/squad-server/layers/layers.js
+++ b/squad-server/layers/layers.js
@@ -17,17 +17,26 @@ class Layers {
       return;
     }
 
-    Logger.verbose('Layers', 1, 'Pulling layers...');
-    const response = await axios.get(
-      'https://raw.githubusercontent.com/Squad-Wiki-Editorial/squad-wiki-pipeline-map-data/dev/completed_output/2.0/finished_2.0.json'
-    );
-
     this.layers = [];
-    for (const layer of response.data.Maps) {
-      this.layers.push(new Layer(layer));
-    }
 
-    Logger.verbose('Layers', 1, `Pulled ${this.layers.length} layers.`);
+    try {
+      Logger.verbose('Layers', 1, 'Pulling layers...');
+      const response = await axios.get(
+        'https://raw.githubusercontent.com/Squad-Wiki-Editorial/squad-wiki-pipeline-map-data/dev/completed_output/2.0/finished_2.0.json'
+      );
+
+      for (const layer of response.data.Maps) {
+        this.layers.push(new Layer(layer));
+      }
+
+      Logger.verbose('Layers', 1, `Pulled ${this.layers.length} layers.`);
+
+      this.pulled = true;
+
+    } catch (error) {
+      Logger.verbose('Layers', 1, `Error pulling layers: ${error.message}`);
+      Logger.verbose('Layers', 3, 'ERROR:', error)
+    }
 
     return this.layers;
   }