Skip to content

Commit ceb3601

Browse files
committed
fix: resolve merge conflict in TelemetryQueue.ts
- Remove duplicate method definitions - Fix malformed code structure from incomplete merge
1 parent 088f2b2 commit ceb3601

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

packages/cloud/src/TelemetryQueue.ts

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,12 @@ export class TelemetryQueue {
202202
}
203203

204204
private async saveQueueState(): Promise<void> {
205-
private async saveQueueState(): Promise<void> {
206-
try {
207-
await this.context.globalState.update(TelemetryQueue.QUEUE_STATE_KEY, this.queueState)
208-
} catch (error) {
209-
console.error(`[TelemetryQueue] Failed to save queue state: ${error}`)
210-
// Continue operation even if persistence fails
211-
}
212-
}
205+
try {
206+
await this.context.globalState.update(TelemetryQueue.QUEUE_STATE_KEY, this.queueState)
207+
} catch (error) {
208+
console.error(`[TelemetryQueue] Failed to save queue state: ${error}`)
209+
// Continue operation even if persistence fails
210+
}
213211
}
214212

215213
private calculateRetryDelay(retryCount: number): number {
@@ -257,16 +255,7 @@ private async saveQueueState(): Promise<void> {
257255

258256
private startConnectionMonitoring(): void {
259257
// Check connection status periodically
260-
private disposed = false;
261-
262-
private startConnectionMonitoring(): void {
263-
// Check connection status periodically
264-
this.connectionCheckTimer = setInterval(() => {
265-
if (!this.disposed) {
266-
vscode.commands.executeCommand("roo-code.checkTelemetryConnection")
267-
}
268-
}, TelemetryQueue.CONNECTION_CHECK_INTERVAL_MS)
269-
}
258+
this.connectionCheckTimer = setInterval(() => {
270259
vscode.commands.executeCommand("roo-code.checkTelemetryConnection")
271260
}, TelemetryQueue.CONNECTION_CHECK_INTERVAL_MS)
272261
}

0 commit comments

Comments
 (0)