A few more minor fixes cleaning up the cloud log state counting.

[bluesky.git] / bluesky / log.c

diff --git a/bluesky/log.c b/bluesky/log.c
index 87639db..d007eca 100644 (file)
--- a/bluesky/log.c
+++ b/bluesky/log.c
@@ -310,6 +310,7 @@ BlueSkyCloudLog *bluesky_log_get_commit_point(BlueSkyFS *fs)
     BlueSkyCloudLog *marker = bluesky_cloudlog_new(fs, NULL);
     marker->type = LOGTYPE_JOURNAL_MARKER;
     marker->data = bluesky_string_new(g_strdup(""), 0);
+    bluesky_cloudlog_stats_update(marker, 1);
     bluesky_cloudlog_sync(marker);
 
     g_mutex_lock(marker->lock);
@@ -332,10 +333,11 @@ void bluesky_log_write_commit_point(BlueSkyFS *fs, BlueSkyCloudLog *marker)
     g_string_append_len(loc, (const gchar *)&seq, sizeof(seq));
     g_string_append_len(loc, (const gchar *)&offset, sizeof(offset));
     commit->data = bluesky_string_new_from_gstring(loc);
+    bluesky_cloudlog_stats_update(commit, 1);
     bluesky_cloudlog_sync(commit);
 
     g_mutex_lock(commit->lock);
-    while ((commit->pending_write & CLOUDLOG_JOURNAL))
+    while ((commit->location_flags & CLOUDLOG_UNCOMMITTED))
         g_cond_wait(commit->cond, commit->lock);
     g_mutex_unlock(commit->lock);
 
@@ -381,6 +383,9 @@ static void cloudlog_fetch_complete(BlueSkyStoreAsync *async,
         char *pathname = g_strdup_printf("%s/%s",
                                          cachefile->log->log_directory,
                                          cachefile->filename);
+        async->data = bluesky_string_dup(async->data);
+        bluesky_cloudlog_decrypt(async->data->data, async->data->len,
+                                 cachefile->fs->keys);
         if (!g_file_set_contents(pathname, async->data->data, async->data->len,
                                  NULL))
             g_print("Error writing out fetched file to cache!\n");
@@ -721,9 +726,11 @@ static void reload_item(BlueSkyCloudLog *log_item,
     /*const BlueSkyCloudPointer *data3
         = (const BlueSkyCloudPointer *)(data + len1 + len2);*/
 
+    bluesky_cloudlog_stats_update(log_item, -1);
     bluesky_string_unref(log_item->data);
     log_item->data = NULL;
     log_item->location_flags = CLOUDLOG_JOURNAL;
+    bluesky_cloudlog_stats_update(log_item, 1);
 
     BlueSkyCloudID id0;
     memset(&id0, 0, sizeof(id0));