Skip to content

Commit

Permalink
Merge pull request #80 from nacos-group/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
wyp12 authored Apr 22, 2019
2 parents 29fc69f + bd4ece9 commit 7c6f6e1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ The path to the target file:

``` xml

nacos-sync/nacossync-distribution/target/nacosSync.0.1.0.zip
nacos-sync/nacossync-distribution/target/nacosSync.0.3.0.zip

```

Expand All @@ -100,7 +100,7 @@ nacosSync
│   ├── application.properties
│   └── logback-spring.xml
├── logs
└── nacosSync-server.0.1.0.jar
└── nacosSync-server.jar

```

Expand Down Expand Up @@ -129,7 +129,7 @@ spring.datasource.password=root
``` xml

$ nacosSync/bin:
sh startup.sh restart
sh startup.sh start

```

Expand Down
2 changes: 1 addition & 1 deletion nacossync-distribution/bin/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ else
JAVA_OPT="${JAVA_OPT} -Xloggc:${BASE_DIR}/logs/nacossync_gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
fi

JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/nacosSync-server.0.1.0.jar"
JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/nacosSync-server.jar"
JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/logback-spring.xml"

echo "$JAVA ${JAVA_OPT}"
Expand Down
1 change: 1 addition & 0 deletions nacossync-distribution/release-nacossync.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<file>
<source>../nacossync-worker/target/nacosSync-server.${parent.version}.jar</source>
<outputDirectory></outputDirectory>
<destName>nacosSync-server.jar</destName>
</file>
</files>
</assembly>

0 comments on commit 7c6f6e1

Please sign in to comment.