Merge lp:~charlesk/pay-service/downgrade-g-warnings into lp:pay-service/15.04

[Charles Kerr]

downgrade some g_critical() log messages to g_warning()

downgrade some g_critical() log messages to g_warning()

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:177
http://jenkins.qa.ubuntu.com/job/pay-service-15.04-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/pay-service-15.04-vivid-armhf-ci/77/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-15.04-ci/77/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

lgtm.

review: Approve

=== modified file 'libpay/internal/package.cpp'
--- libpay/internal/package.cpp	2015-10-15 14:40:42 +0000
+++ libpay/internal/package.cpp	2015-10-15 14:40:43 +0000
@@ -202,88 +202,98 @@
 {
     std::shared_ptr<PayItem> item;
 
-    // test the inputs
-    g_return_val_if_fail(item_properties != nullptr, item);
-    g_return_val_if_fail(g_variant_is_of_type(item_properties, G_VARIANT_TYPE_VARDICT), item);
-
-    // make sure we've got a valid sku to construct the PayItem with
-    const char* sku {};
-    g_variant_lookup(item_properties, "sku", "&s", &sku);
-    if (sku == nullptr)
-    {
-        g_variant_lookup(item_properties, "package_name", "&s", &sku);
-    }
-    g_return_val_if_fail(sku != nullptr, item);
-    g_return_val_if_fail(*sku != '\0', item);
-
-    auto pay_item_deleter = [](PayItem* p){p->unref();};
-    item.reset(new PayItem(sku), pay_item_deleter);
-
-    // now loop through the dict to build the PayItem's properties
-    GVariantIter iter;
-    gchar* key;
-    GVariant* value;
-    g_variant_iter_init(&iter, item_properties);
-    while (g_variant_iter_loop(&iter, "{sv}", &key, &value))
-    {
-        if (!g_strcmp0(key, "acknowledged_timestamp"))
-        {
-            item->set_acknowledged_timestamp(g_variant_get_uint64(value));
-        }
-        else if (!g_strcmp0(key, "description"))
-        {
-            item->set_description(g_variant_get_string(value, nullptr));
-        }
-        else if (!g_strcmp0(key, "sku") || !g_strcmp0(key, "package_name"))
-        {
-            // no-op; we handled the sku/package_name first
-        }
-        else if (!g_strcmp0(key, "price"))
-        {
-            item->set_price(g_variant_get_string(value, nullptr));
-        }
-        else if (!g_strcmp0(key, "completed_timestamp"))
-        {
-            item->set_completed_timestamp(g_variant_get_uint64(value));
-        }
-        else if (!g_strcmp0(key, "refundable_until"))
-        {
-            item->set_refundable_until(g_variant_get_uint64(value));
-        }
-        else if (!g_strcmp0(key, "purchase_id"))
-        {
-            item->set_purchase_id(g_variant_get_uint64(value));
-        }
-        else if (!g_strcmp0(key, "state"))
-        {
-            auto state = g_variant_get_string(value, nullptr);
-
-            if (!g_strcmp0(state, "purchased"))
-            {
-                item->set_status(PAY_PACKAGE_ITEM_STATUS_PURCHASED);
-            }
-            else if (!g_strcmp0(state, "approved"))
-            {
-                item->set_status(PAY_PACKAGE_ITEM_STATUS_APPROVED);
-            }
-            else
-            {
-                item->set_status(PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED);
-            }
-        }
-        else if (!g_strcmp0(key, "type"))
-        {
-            item->set_type(type_from_string(g_variant_get_string(value, nullptr)));
-        }
-        else if (!g_strcmp0(key, "title"))
-        {
-            item->set_title(g_variant_get_string(value, nullptr));
+    if (item_properties == nullptr)
+    {
+        g_warning("%s item_properties variant is NULL", G_STRLOC);
+    }
+    else if (!g_variant_is_of_type(item_properties, G_VARIANT_TYPE_VARDICT))
+    {
+        g_warning("%s item_properties variant is not a vardict", G_STRLOC);
+    }
+    else
+    {
+        // make sure we've got a valid sku to construct the PayItem with
+        const char* sku {};
+        g_variant_lookup(item_properties, "sku", "&s", &sku);
+        if (sku == nullptr)
+            g_variant_lookup(item_properties, "package_name", "&s", &sku);
+
+        if (!sku || !*sku)
+        {
+            g_warning("%s item_properties variant has no sku or package_name entry", G_STRLOC);
         }
         else
         {
-            auto valstr = g_variant_print(value, true);
-            g_warning("Unhandled item property '%s': '%s'", key, valstr);
-            g_free(valstr);
+            auto pay_item_deleter = [](PayItem* p){p->unref();};
+            item.reset(new PayItem(sku), pay_item_deleter);
+
+            // now loop through the dict to build the PayItem's properties
+            GVariantIter iter;
+            gchar* key;
+            GVariant* value;
+            g_variant_iter_init(&iter, item_properties);
+            while (g_variant_iter_loop(&iter, "{sv}", &key, &value))
+            {
+                if (!g_strcmp0(key, "acknowledged_timestamp"))
+                {
+                    item->set_acknowledged_timestamp(g_variant_get_uint64(value));
+                }
+                else if (!g_strcmp0(key, "description"))
+                {
+                    item->set_description(g_variant_get_string(value, nullptr));
+                }
+                else if (!g_strcmp0(key, "sku") || !g_strcmp0(key, "package_name"))
+                {
+                    // no-op; we handled the sku/package_name first
+                }
+                else if (!g_strcmp0(key, "price"))
+                {
+                    item->set_price(g_variant_get_string(value, nullptr));
+                }
+                else if (!g_strcmp0(key, "completed_timestamp"))
+                {
+                    item->set_completed_timestamp(g_variant_get_uint64(value));
+                }
+                else if (!g_strcmp0(key, "refundable_until"))
+                {
+                    item->set_refundable_until(g_variant_get_uint64(value));
+                }
+                else if (!g_strcmp0(key, "purchase_id"))
+                {
+                    item->set_purchase_id(g_variant_get_uint64(value));
+                }
+                else if (!g_strcmp0(key, "state"))
+                {
+                    auto state = g_variant_get_string(value, nullptr);
+
+                    if (!g_strcmp0(state, "purchased"))
+                    {
+                        item->set_status(PAY_PACKAGE_ITEM_STATUS_PURCHASED);
+                    }
+                    else if (!g_strcmp0(state, "approved"))
+                    {
+                        item->set_status(PAY_PACKAGE_ITEM_STATUS_APPROVED);
+                    }
+                    else
+                    {
+                        item->set_status(PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED);
+                    }
+                }
+                else if (!g_strcmp0(key, "type"))
+                {
+                    item->set_type(type_from_string(g_variant_get_string(value, nullptr)));
+                }
+                else if (!g_strcmp0(key, "title"))
+                {
+                    item->set_title(g_variant_get_string(value, nullptr));
+                }
+                else
+                {
+                    auto valstr = g_variant_print(value, true);
+                    g_warning("Unhandled item property '%s': '%s'", key, valstr);
+                    g_free(valstr);
+                }
+            }
         }
     }