Merge branch 'v1' into v1

danbovey · web-flow · commit 1c656465fc2b · 2018-01-22T21:08:00.000Z
diff --git a/index.js b/index.js
@@ -245,8 +245,13 @@ class ServerlessDynamodbLocal {
             }
             dynamodb.raw.createTable(migration, (err) => {
                 if (err) {
-                    this.serverlessLog("DynamoDB - Error - ", err);
-                    reject(err);
+                    if (err.name === 'ResourceInUseException') {
+                        this.serverlessLog(`DynamoDB - Warn - table ${migration.TableName} already exists`);
+                        resolve();
+                    } else {
+                        this.serverlessLog("DynamoDB - Error - ", err);
+                        reject(err);
+                    }
                 } else {
                     this.serverlessLog("DynamoDB - created table " + migration.TableName);
                     resolve(migration);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "serverless-dynamodb-local",
-    "version": "0.2.24",
+    "version": "0.2.25",
     "engines": {
         "node": ">=4.0"
     },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "serverless-dynamodb-local",`
`3`		`- "version": "0.2.24",`
	`3`	`+ "version": "0.2.25",`
`4`	`4`	`"engines": {`
`5`	`5`	`"node": ">=4.0"`
`6`	`6`	`},`