do not update DB
diff --git a/listener.go b/listener.go index 8230176..147f6e3 100644 --- a/listener.go +++ b/listener.go
@@ -54,69 +54,18 @@ log.Panicf("Unable to access database: %v", err) } - err = InitDB(db) - if err != nil { - log.Panicf("Unable to initialize database: %v", err) - } - - var deploymentsToInsert []DataDeployment - var errResults apiDeploymentResults - for _, table := range snapshot.Tables { - switch table.Name { - case DEPLOYMENT_TABLE: - for _, row := range table.Rows { - dep, err := dataDeploymentFromRow(row) - if err == nil { - deploymentsToInsert = append(deploymentsToInsert, dep) - } else { - result := apiDeploymentResult{ - ID: dep.ID, - Status: RESPONSE_STATUS_FAIL, - ErrorCode: TRACKER_ERR_DEPLOYMENT_BAD_JSON, - Message: fmt.Sprintf("unable to parse deployment: %v", err), - } - errResults = append(errResults, result) - } - } - } - } - // ensure that no new database updates are made on old database dbMux.Lock() defer dbMux.Unlock() - - tx, err := db.Begin() - if err != nil { - log.Panicf("Error starting transaction: %v", err) - } - defer tx.Rollback() - - err = insertDeployments(tx, deploymentsToInsert) - if err != nil { - log.Panicf("Error processing Snapshot: %v", err) - } - - err = tx.Commit() - if err != nil { - log.Panicf("Error committing Snapshot change: %v", err) - } - SetDB(db) - for _, dep := range deploymentsToInsert { - queueDownloadRequest(dep) - } - - // transmit parsing errors back immediately - if len(errResults) > 0 { - go transmitDeploymentResultsToServer(errResults) - } - // if no tables, this a startup event for an existing DB - if len(snapshot.Tables) == 0 { - startupOnExistingDatabase() + /* + if len(snapshot.Tables) != 0 { + log.Panic("snapshot.Tables is not empty!") } - + */ + startupOnExistingDatabase() log.Debug("Snapshot processed") } @@ -159,7 +108,7 @@ func processChangeList(changes *common.ChangeList) { - // gather deleted bundle info + // changes have been applied to DB var deploymentsToInsert, deploymentsToDelete []DataDeployment var errResults apiDeploymentResults for _, change := range changes.Changes { @@ -200,28 +149,6 @@ go transmitDeploymentResultsToServer(errResults) } - tx, err := getDB().Begin() - if err != nil { - log.Panicf("Error processing ChangeList: %v", err) - } - defer tx.Rollback() - - for _, dep := range deploymentsToDelete { - err = deleteDeployment(tx, dep.ID) - if err != nil { - log.Panicf("Error processing ChangeList: %v", err) - } - } - err = insertDeployments(tx, deploymentsToInsert) - if err != nil { - log.Panicf("Error processing ChangeList: %v", err) - } - - err = tx.Commit() - if err != nil { - log.Panicf("Error processing ChangeList: %v", err) - } - for _, d := range deploymentsToDelete { deploymentsChanged <- d.ID }
diff --git a/listener_test.go b/listener_test.go index 0c79f3f..3e13b41 100644 --- a/listener_test.go +++ b/listener_test.go
@@ -18,7 +18,7 @@ Context("ApigeeSync snapshot event", func() { - It("should set DB and process", func(done Done) { + XIt("should set DB and process", func(done Done) { deploymentID := "listener_test_1" @@ -231,7 +231,7 @@ Context("ApigeeSync change event", func() { - It("add event should add a deployment", func(done Done) { + XIt("add event should add a deployment", func(done Done) { deploymentID := "add_test_1" @@ -285,7 +285,7 @@ close(done) }) - It("delete event should delete a deployment", func(done Done) { + XIt("delete event should delete a deployment", func(done Done) { deploymentID := "delete_test_1"