improved logging

oxygine/src/AsyncTask.cpp

@@ -3,15 +3,16 @@
 #include <typeinfo>
 namespace oxygine
 {
+#define LOGD(arg) (log::messageln("at: %s (%d) %s", getName().c_str(), getObjectID(), arg))
 
     AsyncTask::AsyncTask() : _status(status_not_started), _mainThreadSync(false)
     {
-
+        setName("AsyncTask");
     }
 
     AsyncTask::~AsyncTask()
     {
-
+        LOGD("~");
     }
 
     void AsyncTask::run()
@@ -19,8 +20,15 @@ namespace oxygine
         OX_ASSERT(_status == status_not_started);
         _status = status_inprogress;
 
+        LOGD("run");
+
         bool ok = _prerun();
-        log::messageln("AsyncTask::run %d - %s", getObjectID(), typeid(*this).name());
+
+        if (!ok)
+        {
+            LOGD("_prerun not ok");
+        }
+
 
         sync([ = ]()
         {
@@ -33,7 +41,7 @@ namespace oxygine
 
     void AsyncTask::_complete()
     {
-        log::messageln("AsyncTask::_complete %d - %s", getObjectID(), typeid(*this).name());
+        LOGD("_complete");
 
         _status = status_completed;
         _onFinal(false);
@@ -52,7 +60,8 @@ namespace oxygine
 
     void AsyncTask::_error()
     {
-        log::messageln("AsyncTask::_error %d - %s", getObjectID(), typeid(*this).name());
+        LOGD("_error");
+
 
         _status = status_failed;
         _onFinal(true);

oxygine/src/HttpRequestTask.cpp

@@ -42,13 +42,13 @@ namespace oxygine
         _suitableResponse(false),
         _responseCodeChecker(_defaultChecker200)
     {
-        _mainThreadSync = true;
+        setName("HttpRequestTask");
 
+        _mainThreadSync = true;
     }
 
     HttpRequestTask::~HttpRequestTask()
     {
-        log::messageln("~HttpRequestTask");
         if (_fhandle)
             file::close(_fhandle);
     }
@@ -181,7 +181,7 @@ namespace oxygine
 
     void HttpRequestTask::_onError()
     {
-        log::warning("http request error: %s", _url.c_str());
+        log::warning("http request error (%d): %s", _responseCode , _url.c_str());
     }
 
     void HttpRequestTask::_onComplete()

oxygine/src/core/android/HttpRequestJavaTask.cpp

@@ -48,12 +48,10 @@ namespace oxygine
 
     HttpRequestJavaTask::HttpRequestJavaTask(): _handle(0)
     {
-        log::messageln("HttpRequestJavaTask %x", this);
     }
 
     HttpRequestJavaTask::~HttpRequestJavaTask()
     {
-        log::messageln("~HttpRequestJavaTask %x", this);
     }
 
     void HttpRequestJavaTask::_run()

oxygine/src/core/android/jniUtils.cpp

@@ -45,11 +45,11 @@ namespace oxygine
             _jUtils = (jclass)env->NewGlobalRef(env->FindClass("org/oxygine/lib/Utils"));
             JNI_NOT_NULL(_jUtils);
 
-			_jUtils_getTimeUTCMS = env->GetStaticMethodID(_jUtils, "getTimeUTCMS", "()J");
-			JNI_NOT_NULL(_jUtils_getTimeUTCMS);
+            _jUtils_getTimeUTCMS = env->GetStaticMethodID(_jUtils, "getTimeUTCMS", "()J");
+            JNI_NOT_NULL(_jUtils_getTimeUTCMS);
 
-			_jUtils_getFreeSpace = env->GetStaticMethodID(_jUtils, "getFreeSpace", "(Ljava/lang/String;)J");
-			JNI_NOT_NULL(_jUtils_getFreeSpace);
+            _jUtils_getFreeSpace = env->GetStaticMethodID(_jUtils, "getFreeSpace", "(Ljava/lang/String;)J");
+            JNI_NOT_NULL(_jUtils_getFreeSpace);
 
             _jUtils_getLanguage = env->GetStaticMethodID(_jUtils, "getLanguage", "()Ljava/lang/String;");
             JNI_NOT_NULL(_jUtils_getLanguage);
@@ -124,17 +124,17 @@ namespace oxygine
     }
 
 
-	int64			jniGetFreeSpace(const char *path)
-	{
-		JNIEnv* env = jniGetEnv();
-		LOCAL_REF_HOLDER(env);
+    int64           jniGetFreeSpace(const char* path)
+    {
+        JNIEnv* env = jniGetEnv();
+        LOCAL_REF_HOLDER(env);
+
+        jstring jarg = env->NewStringUTF(path);
+        jlong value = env->CallStaticLongMethod(_jUtils, _jUtils_getFreeSpace, jarg);
+        return value;
 
-		jstring jarg = env->NewStringUTF(path);
-		jlong value = env->CallStaticLongMethod(_jUtils, _jUtils_getFreeSpace, jarg);
-		return value;
 
-		
-	}
+    }
 
     bool            jniExit()
     {

oxygine/src/core/android/jniUtils.h

@@ -18,7 +18,7 @@ namespace oxygine
     std::string     jniGetPackage();
     bool            jniIsNetworkAvailable();
 
-	int64			jniGetFreeSpace(const char *);
+    int64           jniGetFreeSpace(const char*);
 
     bool            jniExit();
     void            jniRestartApp();

oxygine/src/core/curl/HttpRequestCurlTask.cpp

@@ -203,7 +203,6 @@ namespace oxygine
 
     HttpRequestTaskCURL::~HttpRequestTaskCURL()
     {
-        log::messageln("~HttpRequestTaskCURL");
         if (_easy)
             curl_easy_cleanup(_easy);
         _easy = 0;

oxygine/src/core/emscripten/HttpRequestEmscriptenTask.cpp

@@ -48,7 +48,6 @@ namespace oxygine
     {
         addRef();
 
-        log::messageln("HttpRequestEmscriptenTask::_run %s", _url.c_str());
         const char* method = _postData.empty() ? "GET" : "POST";
         if (!_postData.empty())
             _postData.push_back(0);

oxygine/src/core/ios/ios.h

@@ -16,6 +16,6 @@ namespace oxygine
 
     void iosGetMemoryUsage(size_t& a);
     void iosNavigate(const char*);
-    
+
     int64 iosGetFreeDiskspace();
 }

oxygine/src/core/oxygine.cpp

@@ -1013,20 +1013,20 @@ namespace oxygine
         return true;
     }
 
-	int64 getFreeSpace(const char *fullpath /*= 0*/)
-	{
+    int64 getFreeSpace(const char* fullpath /*= 0*/)
+    {
 #ifdef __ANDROID__
-		if (fullpath)
-			return jniGetFreeSpace(fullpath);
-		return jniGetFreeSpace(file::wfs().getFullPath("").c_str());
+        if (fullpath)
+            return jniGetFreeSpace(fullpath);
+        return jniGetFreeSpace(file::wfs().getFullPath("").c_str());
 #elif __APPLE__
         return iosGetFreeDiskspace();
 #endif
-        
-		return std::numeric_limits<int64>::max();
-	}
 
-	std::string     getLanguage()
+        return std::numeric_limits<int64>::max();
+    }
+
+    std::string     getLanguage()
     {
 #ifdef __ANDROID__
         return jniGetLanguage();

oxygine/src/core/oxygine.h

@@ -32,7 +32,7 @@ namespace oxygine
     bool            isNetworkAvailable();
 
 
-	int64			getFreeSpace(const char *fullpath = 0);
+    int64           getFreeSpace(const char* fullpath = 0);
 
     /**returns locale. ISO 639-1 */
     std::string     getLanguage();