Skip to content

Commit

Permalink
Merge pull request #51 from AO-StreetArt/testingFixes
Browse files Browse the repository at this point in the history
Testing fixes
  • Loading branch information
AO-StreetArt committed Mar 24, 2018
2 parents 17595cb + 25c8434 commit 5e76e7d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/main/java/adrestia/Adrestia.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.mongodb.MongoClient;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.DiscoveryClient;
Expand All @@ -37,7 +38,7 @@
*/
@EnableDiscoveryClient
@Configuration
@SpringBootApplication
@SpringBootApplication(exclude={SolrAutoConfiguration.class})
public class Adrestia extends AbstractMongoConfiguration {

// Hostname of Mongo Connection
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/adrestia/controller/scene/SceneController.java
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ public ResponseEntity<Scene> updateScene(
inpScene.setKey(ivanRespKey);
logger.debug("Ivan Response Key: " + ivanRespKey);
}
} else {
logger.debug("Failure response from Crazy Ivan");
}

// Update the scene
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/log4j2.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Configutation:
Configuration:
name: Default

Properties:
Expand Down

0 comments on commit 5e76e7d

Please sign in to comment.