|
|
@@ -7,6 +7,7 @@ using System.Drawing;
|
|
7
|
7
|
using System.Globalization;
|
|
8
|
8
|
using System.Threading;
|
|
9
|
9
|
using System.Windows.Forms;
|
|
|
10
|
+using Serilog;
|
|
10
|
11
|
|
|
11
|
12
|
namespace BulkPrinting
|
|
12
|
13
|
{
|
|
|
@@ -283,6 +284,8 @@ namespace BulkPrinting
|
|
283
|
284
|
bool skipNewBatchCheck = false;
|
|
284
|
285
|
while (true)
|
|
285
|
286
|
{
|
|
|
287
|
+ Log.Debug("Download thread sleeping");
|
|
|
288
|
+
|
|
286
|
289
|
bool forceNewBatchCheck;
|
|
287
|
290
|
lock (LoadingThreadLock)
|
|
288
|
291
|
{
|
|
|
@@ -294,9 +297,12 @@ namespace BulkPrinting
|
|
294
|
297
|
RetryDownloads = false;
|
|
295
|
298
|
CheckForNewBatches = false;
|
|
296
|
299
|
}
|
|
|
300
|
+
|
|
|
301
|
+ Log.Debug("Download thread woke up");
|
|
|
302
|
+
|
|
297
|
303
|
if (Globals.SessionMode == SessionModes.Online)
|
|
298
|
304
|
{
|
|
299
|
|
- Debug.WriteLine("Checking for downloads");
|
|
|
305
|
+ Log.Debug("Checking for downloads");
|
|
300
|
306
|
|
|
301
|
307
|
if (forceNewBatchCheck)
|
|
302
|
308
|
{
|
|
|
@@ -309,7 +315,8 @@ namespace BulkPrinting
|
|
309
|
315
|
{
|
|
310
|
316
|
while (!skipNewBatchCheck)
|
|
311
|
317
|
{
|
|
312
|
|
- Debug.WriteLine("Querying batches");
|
|
|
318
|
+ Log.Debug("Querying batches");
|
|
|
319
|
+
|
|
313
|
320
|
Page<Batch> BatchPage = new Page<Batch>();
|
|
314
|
321
|
if (Utility.RESTRequest(ref BatchPage, String.Format("/api/batches/?lastBatchId={0}", lastSyncedBatchId)))
|
|
315
|
322
|
{
|
|
|
@@ -342,8 +349,7 @@ namespace BulkPrinting
|
|
342
|
349
|
}
|
|
343
|
350
|
catch (Exception e)
|
|
344
|
351
|
{
|
|
345
|
|
- Debug.WriteLine("Error while downloading batches");
|
|
346
|
|
- Debug.WriteLine(e.ToString());
|
|
|
352
|
+ Log.Error(e, "Error while downloading batch list");
|
|
347
|
353
|
}
|
|
348
|
354
|
|
|
349
|
355
|
if (refreshGrid)
|
|
|
@@ -385,7 +391,7 @@ namespace BulkPrinting
|
|
385
|
391
|
|
|
386
|
392
|
while (voucherCount < batch.DeliveredQuantity)
|
|
387
|
393
|
{
|
|
388
|
|
- Debug.WriteLine(String.Format("Downloading vouchers for batch {0} (got {1})", batchId, voucherCount));
|
|
|
394
|
+ Log.Debug("Downloading vouchers for batch {0} ({1} so far)", batchId, voucherCount);
|
|
389
|
395
|
|
|
390
|
396
|
int page = voucherCount / voucherPageSize + 1;
|
|
391
|
397
|
int offset = voucherCount % voucherPageSize;
|
|
|
@@ -400,7 +406,7 @@ namespace BulkPrinting
|
|
400
|
406
|
throw new Exception(String.Format("Too few vouchers were returned for batch {0}", batchId));
|
|
401
|
407
|
}
|
|
402
|
408
|
|
|
403
|
|
- Debug.WriteLine(String.Format("Downloaded vouchers for batch {0} (got {1})", batchId, voucherCount + voucherPage.Items.Count));
|
|
|
409
|
+ Log.Debug("Downloaded vouchers for batch {0} ({1} so far)", batchId, voucherCount);
|
|
404
|
410
|
|
|
405
|
411
|
lock (Globals.DBWriteLock)
|
|
406
|
412
|
{
|
|
|
@@ -433,7 +439,7 @@ namespace BulkPrinting
|
|
433
|
439
|
}
|
|
434
|
440
|
}
|
|
435
|
441
|
|
|
436
|
|
- Debug.WriteLine(String.Format("Inserted vouchers for batch {0}", batchId));
|
|
|
442
|
+ Log.Debug("Inserted vouchers for batch {0}", batchId);
|
|
437
|
443
|
}
|
|
438
|
444
|
|
|
439
|
445
|
if (voucherCount > batch.DeliveredQuantity)
|
|
|
@@ -442,7 +448,7 @@ namespace BulkPrinting
|
|
442
|
448
|
}
|
|
443
|
449
|
else
|
|
444
|
450
|
{
|
|
445
|
|
- Debug.WriteLine(String.Format("Batch {0} complete", batchId));
|
|
|
451
|
+ Log.Debug("Batch {0} complete", batchId);
|
|
446
|
452
|
|
|
447
|
453
|
Utility.DBExecuteNonQuery(conn,
|
|
448
|
454
|
"UPDATE Batch SET Downloaded=1 WHERE Id=@BatchId",
|
|
|
@@ -453,7 +459,7 @@ namespace BulkPrinting
|
|
453
|
459
|
else if (batch == null)
|
|
454
|
460
|
{
|
|
455
|
461
|
// Batch will only be null if we got a 404.
|
|
456
|
|
- Debug.WriteLine(String.Format("Removing deleted batch {0}", batchId));
|
|
|
462
|
+ Log.Debug("Removing deleted batch {0}", batchId);
|
|
457
|
463
|
|
|
458
|
464
|
Utility.DBExecuteNonQuery(conn,
|
|
459
|
465
|
"DELETE FROM Voucher WHERE BatchId=@BatchId",
|
|
|
@@ -468,8 +474,7 @@ namespace BulkPrinting
|
|
468
|
474
|
}
|
|
469
|
475
|
catch (Exception e)
|
|
470
|
476
|
{
|
|
471
|
|
- Debug.WriteLine(String.Format("Error while downloading vouchers for batch {0}", batchId));
|
|
472
|
|
- Debug.WriteLine(e.ToString());
|
|
|
477
|
+ Log.Error(e, "Error while downloading vouchers for batch {0}", batchId);
|
|
473
|
478
|
}
|
|
474
|
479
|
|
|
475
|
480
|
if (refreshGrid)
|
|
|
@@ -485,10 +490,13 @@ namespace BulkPrinting
|
|
485
|
490
|
}
|
|
486
|
491
|
catch (Exception e)
|
|
487
|
492
|
{
|
|
488
|
|
- Debug.WriteLine("Error while downloading vouchers");
|
|
489
|
|
- Debug.WriteLine(e.ToString());
|
|
|
493
|
+ Log.Error(e, "Error while downloading vouchers");
|
|
490
|
494
|
}
|
|
491
|
495
|
}
|
|
|
496
|
+ else
|
|
|
497
|
+ {
|
|
|
498
|
+ Log.Debug("Offline, skipping download check");
|
|
|
499
|
+ }
|
|
492
|
500
|
}
|
|
493
|
501
|
}
|
|
494
|
502
|
}
|