Skip to content

Commit

Permalink
Merge branch 'devel' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrián Escoms authored Jul 3, 2017
2 parents c5e55ce + f7705b9 commit 0771a3c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
10 changes: 10 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## Release Notes for Stampede 1.0.0-beta3

### Changes


### Bugs Fixed

* Stampede use wrong format for dates before year 1 using PostgreSQL's COPY.
* Stampede give an internal error when MongoDB password is not found and authentication is enabled.

## Release Notes for Stampede 1.0.0-beta2

### Changes
Expand Down
17 changes: 16 additions & 1 deletion main/src/main/java/com/torodb/stampede/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import com.torodb.packaging.config.model.backend.BackendPasswordConfig;
import com.torodb.packaging.config.model.backend.postgres.AbstractPostgres;
import com.torodb.packaging.config.model.protocol.mongo.AbstractShardReplication;
import com.torodb.packaging.config.model.protocol.mongo.AuthMode;
import com.torodb.packaging.config.model.protocol.mongo.MongoPasswordConfig;
import com.torodb.packaging.config.util.BackendImplementationVisitor;
import com.torodb.packaging.config.util.BackendImplementationVisitorWithDefault;
Expand Down Expand Up @@ -225,7 +226,21 @@ public String getDatabase() {
+ "Please add following line to file " + postgres.getToropassFile() + ":\n"
+ postgres.getHost() + ":" + postgres.getPort() + ":"
+ postgres.getDatabase() + ":" + postgres.getUser() + ":<password>\n"
+ "Replace <password> for database user " + postgres.getUser() + "'s password");
+ "Replace <password> with the password of backend user " + postgres.getUser());
}
}

for (AbstractShardReplication shard : shards) {
if (shard.getAuth().getMode().value() != AuthMode.disabled
&& config.getReplication().getAuth().getPassword() == null) {
throw new SystemException("No password provided for database user "
+ shard.getAuth().getUser().value() + ".\n\n"
+ "Please add following line to file "
+ config.getReplication().getMongopassFile() + ":\n"
+ shard.getSyncSource().value() + ":" + shard.getAuth().getSource().value()
+ ":" + shard.getAuth().getUser().value() + ":<password>\n"
+ "Replace <password> with the password of mongodb user "
+ shard.getAuth().getUser().value());
}
}

Expand Down

0 comments on commit 0771a3c

Please sign in to comment.