Skip to content

Commit

Permalink
Merge pull request #459 from tochi-y/1.7.8_es6.6.1-dev
Browse files Browse the repository at this point in the history
Release v1.7.8e
  • Loading branch information
tochi-y authored Aug 2, 2019
2 parents 33385b7 + 69c1d06 commit 7c0d620
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.7.8e
IMPROVEMENTS:
* Add IO logging with IO time of reading a Metafile.

## 1.7.8d
IMPROVEMENTS:
* Add IO logging with IO time. ([#446](https://github.com/personium/personium-core/issues/446))
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>io.personium</groupId>
<artifactId>personium-core</artifactId>
<packaging>war</packaging>
<version>1.7.8d_es6.6.1</version>
<version>1.7.8e_es6.6.1</version>
<name>personium-core Maven Webapp</name>
<url>http://maven.apache.org</url>
<licenses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,18 @@ public void load() {
* load from the file.
*/
private void doLoad() throws PersoniumCoreException {
// write start log
PersoniumCoreLog.Dav.FILE_OPERATION_START.params(file.toPath()).writeLog();
ElapsedTimeLog endLog = ElapsedTimeLog.Dav.FILE_OPERATION_END.params();
endLog.setStartTime();

try (Reader reader = Files.newBufferedReader(file.toPath(), Charsets.UTF_8)) {
JSONParser parser = new JSONParser();
this.json = (JSONObject) parser.parse(reader);
// write end log
int jsonSize = this.json.toJSONString().getBytes(Charsets.UTF_8).length;
endLog.setParams(jsonSize / KILO_BYTES);
endLog.writeLog();
} catch (IOException | ParseException e) {
// IO failure or JSON is broken
throw PersoniumCoreException.Dav.DAV_INCONSISTENCY_FOUND.reason(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#################################################

# core version
io.personium.core.version=1.7.8d
io.personium.core.version=1.7.8e

# thread pool num.
io.personium.core.thread.pool.num.io.cell=10
Expand Down

0 comments on commit 7c0d620

Please sign in to comment.