Skip to content

Commit 2827a57

Browse files
Solve inconsistant spacing in sync logs (#143)
Before ``` [VSCODE] bricks cli path: /Users/shreyas.goenka/databricks-vscode/packages/databricks-vscode/bin/bricks [VSCODE] sync command args: sync,--remote-path,/Repos/shreyas.goenka@databricks.com/test-dbx,--persist-snapshot=false [VSCODE] env vars: {"BRICKS_ROOT":"/Users/shreyas.goenka/test-dbx","DATABRICKS_CONFIG_PROFILE":"DOGFOOD"} -------------------------------------------------------- 2022/10/27 16:51:14 [INFO] Remote file sync location: /Repos/shreyas.goenka@databricks.com/test-dbx 2022/10/27 16:51:14 [INFO] Loading DOGFOOD profile from /Users/shreyas.goenka/.databrickscfg 2022/10/27 16:51:16 [INFO] Action: PUT: 10.fake, hello.py, 1.fake, 11.fake, 6.fake, 7.fake, h, 8.fake, 4.fake, .gitignore, 14.fake, 5.fake, 9.fake, 2.fake, 12.fake, databricks.yml, 13.fake, 3.fake, .dbx/sync/n 2022/10/27 16:51:17 [INFO] Uploaded hello.py 2022/10/27 16:51:17 [INFO] Uploaded 1.fake 2022/10/27 16:51:17 [INFO] Uploaded 7.fake 2022/10/27 16:51:17 [INFO] Uploaded 6.fake 2022/10/27 16:51:17 [INFO] Uploaded 11.fake 2022/10/27 16:51:17 [INFO] Uploaded .dbx/sync/n 2022/10/27 16:51:17 [INFO] Uploaded 10.fake 2022/10/27 16:51:17 [INFO] Uploaded 12.fake 2022/10/27 16:51:17 [INFO] Uploaded databricks.yml 2022/10/27 16:51:17 [INFO] Uploaded h 2022/10/27 16:51:18 [INFO] Uploaded 2.fake 2022/10/27 16:51:18 [INFO] Uploaded 13.fake 2022/10/27 16:51:18 [INFO] Uploaded 9.fake 2022/10/27 16:51:18 [INFO] Uploaded 8.fake 2022/10/27 16:51:18 [INFO] Uploaded 5.fake 2022/10/27 16:51:18 [INFO] Uploaded 3.fake 2022/10/27 16:51:18 [INFO] Uploaded .gitignore 2022/10/27 16:51:18 [INFO] Uploaded 4.fake 2022/10/27 16:51:18 [INFO] Uploaded 14.fake 2022/10/27 16:51:18 [INFO] Initial Sync Complete ``` After ``` [VSCODE] bricks cli path: /Users/shreyas.goenka/databricks-vscode/packages/databricks-vscode/bin/bricks [VSCODE] sync command args: sync,--remote-path,/Repos/shreyas.goenka@databricks.com/test-dbx,--persist-snapshot=false [VSCODE] env vars: {"BRICKS_ROOT":"/Users/shreyas.goenka/test-dbx","DATABRICKS_CONFIG_PROFILE":"DOGFOOD"} -------------------------------------------------------- 2022/10/27 16:49:24 [INFO] Remote file sync location: /Repos/shreyas.goenka@databricks.com/test-dbx 2022/10/27 16:49:24 [INFO] Loading DOGFOOD profile from /Users/shreyas.goenka/.databrickscfg 2022/10/27 16:49:26 [INFO] Action: PUT: 10.fake, hello.py, 1.fake, 11.fake, 6.fake, 7.fake, h, 8.fake, 4.fake, .gitignore, 14.fake, 5.fake, 9.fake, 2.fake, 12.fake, databricks.yml, 13.fake, 3.fake, .dbx/sync/n 2022/10/27 16:49:27 [INFO] Uploaded 10.fake 2022/10/27 16:49:27 [INFO] Uploaded .gitignore 2022/10/27 16:49:27 [INFO] Uploaded .dbx/sync/n 2022/10/27 16:49:27 [INFO] Uploaded 5.fake 2022/10/27 16:49:27 [INFO] Uploaded 2.fake 2022/10/27 16:49:27 [INFO] Uploaded 12.fake 2022/10/27 16:49:27 [INFO] Uploaded 13.fake 2022/10/27 16:49:27 [INFO] Uploaded 9.fake 2022/10/27 16:49:28 [INFO] Uploaded hello.py 2022/10/27 16:49:28 [INFO] Uploaded 14.fake 2022/10/27 16:49:28 [INFO] Uploaded 3.fake 2022/10/27 16:49:28 [INFO] Uploaded 7.fake 2022/10/27 16:49:28 [INFO] Uploaded 6.fake 2022/10/27 16:49:28 [INFO] Uploaded 11.fake 2022/10/27 16:49:28 [INFO] Uploaded databricks.yml 2022/10/27 16:49:28 [INFO] Uploaded h 2022/10/27 16:49:28 [INFO] Uploaded 8.fake 2022/10/27 16:49:28 [INFO] Uploaded 1.fake 2022/10/27 16:49:28 [INFO] Uploaded 4.fake 2022/10/27 16:49:28 [INFO] Initial Sync Complete ~``
1 parent 0e09ee5 commit 2827a57

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

packages/databricks-vscode/src/cli/BricksTasks.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,14 +196,23 @@ export class BricksSyncParser {
196196
// TODO: Use structed logging to compute the sync state here
197197
public process(data: string) {
198198
var logLines = data.split("\n");
199-
for (let line of logLines) {
199+
for (let i = 0; i < logLines.length; i++) {
200+
var line = logLines[i];
200201
this.parseForActionsInitiated(line);
201202
this.parseForUploadCompleted(line);
202203
this.parseForDeleteCompleted(line);
203204
// this.writeEmitter.fire writes to the pseudoterminal for the
204205
// bricks sync process
205206
this.writeEmitter.fire(line.trim());
206-
this.writeEmitter.fire("\n\r");
207+
208+
// When vscode flush prints the logs from events fired here,
209+
// it automatically adds a new line. Since we can reasonably expect
210+
// with a high probablity that all logs in one call of this process(data) func will
211+
// be flushed together, we do not add a new line at the last event
212+
// to keep the new line spacing consistant
213+
if (i !== logLines.length - 1) {
214+
this.writeEmitter.fire("\n\r");
215+
}
207216
}
208217
if (
209218
this.filesBeingDeleted.size === 0 &&

0 commit comments

Comments
 (0)