Logging: call flush before close (#4784)

meltsufin · chingor13 · commit aee1e2e1ee11 · 2019-05-01T13:30:12.000-07:00
* Logging: call flush before close Also prevent more logs to be written after close. Fixes #4783. * code style fix
diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
@@ -582,6 +582,8 @@ public void flush() {
 
   /* Write logs synchronously or asynchronously based on writeSynchronicity setting. */
   private void writeLogEntries(Iterable<LogEntry> logEntries, WriteOption... writeOptions) {
+    if (closed) return;
+
     switch (this.writeSynchronicity) {
       case SYNC:
         get(writeAsync(logEntries, writeOptions));
@@ -688,6 +690,7 @@ public void close() throws Exception {
       return;
     }
     closed = true;
+    flush();
     rpc.close();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -582,6 +582,8 @@ public void flush() {`
`582`	`582`
`583`	`583`	`/* Write logs synchronously or asynchronously based on writeSynchronicity setting. */`
`584`	`584`	`private void writeLogEntries(Iterable<LogEntry> logEntries, WriteOption... writeOptions) {`
	`585`	`+ if (closed) return;`
	`586`	`+`
`585`	`587`	`switch (this.writeSynchronicity) {`
`586`	`588`	`case SYNC:`
`587`	`589`	`get(writeAsync(logEntries, writeOptions));`
`@@ -688,6 +690,7 @@ public void close() throws Exception {`
`688`	`690`	`return;`
`689`	`691`	`}`
`690`	`692`	`closed = true;`
	`693`	`+ flush();`
`691`	`694`	`rpc.close();`
`692`	`695`	`}`
`693`	`696`