Switch to an embedded variant of LibComponentLogging with prefix RK

tabeso · Sep 27, 2012 · bc7c65f · bc7c65f
1 parent b80f083
commit bc7c65f
Show file tree

Hide file tree

Showing 40 changed files with 357 additions and 559 deletions.
diff --git a/Code/CoreData/RKEntityByAttributeCache.m b/Code/CoreData/RKEntityByAttributeCache.m
@@ -18,7 +18,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreDataCache
+#define RKLogComponent RKlcl_cRestKitCoreDataCache
 
 @interface RKEntityByAttributeCache ()
 @property (nonatomic, strong) NSMutableDictionary *attributeValuesToObjectIDs;

diff --git a/Code/CoreData/RKEntityMapping.m b/Code/CoreData/RKEntityMapping.m
@@ -28,7 +28,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 // Implemented in RKMappingOperation
 BOOL RKValueIsEqualToValue(id sourceValue, id destinationValue);

diff --git a/Code/CoreData/RKFetchRequestManagedObjectCache.m b/Code/CoreData/RKFetchRequestManagedObjectCache.m
@@ -14,7 +14,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 @implementation RKFetchRequestManagedObjectCache
 

diff --git a/Code/CoreData/RKInMemoryManagedObjectCache.m b/Code/CoreData/RKInMemoryManagedObjectCache.m
@@ -14,7 +14,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 //static NSString * const RKInMemoryObjectManagedObjectCacheThreadDictionaryKey = @"RKInMemoryObjectManagedObjectCacheThreadDictionaryKey";
 

diff --git a/Code/CoreData/RKManagedObjectImporter.m b/Code/CoreData/RKManagedObjectImporter.m
@@ -32,7 +32,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 @interface RKManagedObjectImporter ()
 @property (nonatomic, strong, readwrite) NSManagedObjectModel *managedObjectModel;

diff --git a/Code/CoreData/RKManagedObjectStore.m b/Code/CoreData/RKManagedObjectStore.m
@@ -29,7 +29,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 NSString * const RKSQLitePersistentStoreSeedDatabasePathOption = @"RKSQLitePersistentStoreSeedDatabasePathOption";
 NSString * const RKManagedObjectStoreDidFailSaveNotification = @"RKManagedObjectStoreDidFailSaveNotification";

diff --git a/Code/CoreData/RKManagedObjectThreadSafeInvocation.m b/Code/CoreData/RKManagedObjectThreadSafeInvocation.m
@@ -23,7 +23,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 @interface RKManagedObjectThreadSafeInvocation ()
 @property (nonatomic, strong) NSMutableDictionary *argumentKeyPaths;

diff --git a/Code/CoreData/RKObjectPropertyInspector+CoreData.m b/Code/CoreData/RKObjectPropertyInspector+CoreData.m
@@ -29,7 +29,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 @implementation RKPropertyInspector (CoreData)
 

diff --git a/Code/CoreData/RKRelationshipConnectionOperation.m b/Code/CoreData/RKRelationshipConnectionOperation.m
@@ -15,7 +15,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 @interface RKRelationshipConnectionOperation ()
 @property (nonatomic, strong, readwrite) NSManagedObject *managedObject;

diff --git a/Code/Network/RKHTTPRequestOperation.m b/Code/Network/RKHTTPRequestOperation.m
@@ -20,13 +20,13 @@
 
 #import "RKHTTPRequestOperation.h"
 #import "RKLog.h"
-#import "lcl.h"
+#import "lcl_RK.h"
 #import "RKHTTPUtilities.h"
 #import "RKMIMETypes.h"
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitNetwork
+#define RKLogComponent RKlcl_cRestKitNetwork
 
 @interface RKHTTPRequestOperationLogger : NSObject
 
@@ -81,7 +81,7 @@ - (void)HTTPOperationDidStart:(NSNotification *)notification
         body = [NSString stringWithUTF8String:[[operation.request HTTPBody] bytes]];
     }
 
-    if ((_lcl_component_level[(__lcl_log_symbol(lcl_cRestKitNetwork))]) >= (__lcl_log_symbol(lcl_vTrace))) {
+    if ((_RKlcl_component_level[(__RKlcl_log_symbol(RKlcl_cRestKitNetwork))]) >= (__RKlcl_log_symbol(RKlcl_vTrace))) {
         RKLogTrace(@"%@ '%@':\nrequest.headers=%@\nrequest.body=%@", [operation.request HTTPMethod], [[operation.request URL] absoluteString], [operation.request allHTTPHeaderFields], body);
     } else {
         RKLogInfo(@"%@ '%@'", [operation.request HTTPMethod], [[operation.request URL] absoluteString]);
@@ -92,13 +92,13 @@ - (void)HTTPOperationDidFinish:(NSNotification *)notification
 {
     RKHTTPRequestOperation *operation = [notification object];
     if (operation.error) {
-        if ((_lcl_component_level[(__lcl_log_symbol(lcl_cRestKitNetwork))]) >= (__lcl_log_symbol(lcl_vTrace))) {
+        if ((_RKlcl_component_level[(__RKlcl_log_symbol(RKlcl_cRestKitNetwork))]) >= (__RKlcl_log_symbol(RKlcl_vTrace))) {
             RKLogError(@"%@ '%@' (%ld):\nerror=%@\nresponse.body=%@", [operation.request HTTPMethod], [[operation.request URL] absoluteString], (long)[operation.response statusCode], operation.error, operation.responseString);
         } else {
           RKLogError(@"%@ '%@' (%ld): %@", [operation.request HTTPMethod], [[operation.request URL] absoluteString], (long)[operation.response statusCode], operation.error);
         }
     } else {
-        if ((_lcl_component_level[(__lcl_log_symbol(lcl_cRestKitNetwork))]) >= (__lcl_log_symbol(lcl_vTrace))) {
+        if ((_RKlcl_component_level[(__RKlcl_log_symbol(RKlcl_cRestKitNetwork))]) >= (__RKlcl_log_symbol(RKlcl_vTrace))) {
             RKLogTrace(@"%@ '%@' (%ld):\nresponse.headers=%@\nresponse.body=%@", [operation.request HTTPMethod], [[operation.request URL] absoluteString], (long)[operation.response statusCode], [operation.response allHeaderFields], operation.responseString);
         } else {
             RKLogInfo(@"%@ '%@' (%ld)", [operation.request HTTPMethod], [[operation.request URL] absoluteString], (long)[operation.response statusCode]);

diff --git a/Code/Network/RKManagedObjectRequestOperation.m b/Code/Network/RKManagedObjectRequestOperation.m
@@ -28,7 +28,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 @interface RKManagedObjectRequestOperation () <RKMapperOperationDelegate>
 // Core Data specific

diff --git a/Code/Network/RKObjectParameterization.m b/Code/Network/RKObjectParameterization.m
@@ -30,7 +30,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitNetwork
+#define RKLogComponent RKlcl_cRestKitNetwork
 
 @interface RKObjectParameterization () <RKMappingOperationDelegate>
 @property (nonatomic, strong) id object;

diff --git a/Code/Network/RKObjectRequestOperation.m b/Code/Network/RKObjectRequestOperation.m
@@ -26,7 +26,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitNetwork
+#define RKLogComponent RKlcl_cRestKitNetwork
 
 static inline NSString *RKDescriptionForRequest(NSURLRequest *request)
 {

diff --git a/Code/Network/RKResponseMapperOperation.m b/Code/Network/RKResponseMapperOperation.m
@@ -29,7 +29,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitNetwork
+#define RKLogComponent RKlcl_cRestKitNetwork
 
 // Defined in RKObjectManager.h
 NSURL *RKBaseURLAssociatedWithURL(NSURL *URL);

diff --git a/Code/ObjectMapping/RKDynamicMapping.m b/Code/ObjectMapping/RKDynamicMapping.m
@@ -24,7 +24,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitObjectMapping
+#define RKLogComponent RKlcl_cRestKitObjectMapping
 
 @interface RKDynamicMapping ()
 @property (nonatomic, strong) NSMutableArray *matchers;

diff --git a/Code/ObjectMapping/RKMapperOperation.m b/Code/ObjectMapping/RKMapperOperation.m
@@ -30,7 +30,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitObjectMapping
+#define RKLogComponent RKlcl_cRestKitObjectMapping
 
 static NSString *RKDelegateKeyPathFromKeyPath(NSString *keyPath)
 {

diff --git a/Code/ObjectMapping/RKMappingOperation.m b/Code/ObjectMapping/RKMappingOperation.m
@@ -32,7 +32,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitObjectMapping
+#define RKLogComponent RKlcl_cRestKitObjectMapping
 
 // Temporary home for object equivalancy tests
 BOOL RKValueIsEqualToValue(id sourceValue, id destinationValue);

diff --git a/Code/ObjectMapping/RKPropertyInspector.m b/Code/ObjectMapping/RKPropertyInspector.m
@@ -24,7 +24,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitObjectMapping
+#define RKLogComponent RKlcl_cRestKitObjectMapping
 
 @implementation RKPropertyInspector
 

diff --git a/Code/RestKit.h b/Code/RestKit.h
@@ -31,4 +31,4 @@
  to use RKLog() in their own app.
  */
 #undef RKLogComponent
-#define RKLogComponent lcl_cApp
+#define RKLogComponent RKlcl_cApp
diff --git a/Code/Search/RKSearchIndexer.m b/Code/Search/RKSearchIndexer.m
@@ -14,7 +14,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitSearch
+#define RKLogComponent RKlcl_cRestKitSearch
 
 NSString * const RKSearchableAttributeNamesUserInfoKey = @"RestKitSearchableAttributes";
 

diff --git a/Code/Search/RKSearchWord.m b/Code/Search/RKSearchWord.m
@@ -23,7 +23,7 @@
 
 // Set Logging Component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitCoreData
+#define RKLogComponent RKlcl_cRestKitCoreData
 
 @implementation RKSearchWord
 

diff --git a/Code/Support/RKLog.h b/Code/Support/RKLog.h
@@ -21,10 +21,10 @@
 /**
  RestKit Logging is based on the LibComponentLogging framework
 
- @see lcl_config_components.h
- @see lcl_config_logger.h
+ @see lcl_config_components_RK.h
+ @see lcl_config_logger_RK.h
  */
-#import "lcl.h"
+#import "lcl_RK.h"
 
 /**
  RKLogComponent defines the active component within any given portion of RestKit
@@ -35,7 +35,7 @@
 
  The component can be undef'd and redefined to change the active logging component.
  */
-#define RKLogComponent lcl_cRestKit
+#define RKLogComponent RKlcl_cRestKit
 
 /**
  The logging macros. These macros will log to the currently active logging component
@@ -44,10 +44,10 @@
  For example, in the `RKMappingOperation` class we would redefine the RKLogComponent:
 
     #undef RKLogComponent
-    #define RKLogComponent lcl_cRestKitObjectMapping
+    #define RKLogComponent RKlcl_cRestKitObjectMapping
 
- The lcl_c prefix is the LibComponentLogging data structure identifying the logging component
- we want to target within this portion of the codebase. See lcl_config_component.h for reference.
+ The RKlcl_c prefix is the LibComponentLogging data structure identifying the logging component
+ we want to target within this portion of the codebase. See lcl_config_component_RK.h for reference.
 
  Having defined the logging component, invoking the logger via:
 
@@ -61,35 +61,35 @@
  than the level the message was logged at (in this case, Info).
  */
 #define RKLogCritical(...)                                                              \
-lcl_log(RKLogComponent, lcl_vCritical, @"" __VA_ARGS__)
+RKlcl_log(RKLogComponent, RKlcl_vCritical, @"" __VA_ARGS__)
 
 #define RKLogError(...)                                                                 \
-lcl_log(RKLogComponent, lcl_vError, @"" __VA_ARGS__)
+RKlcl_log(RKLogComponent, RKlcl_vError, @"" __VA_ARGS__)
 
 #define RKLogWarning(...)                                                               \
-lcl_log(RKLogComponent, lcl_vWarning, @"" __VA_ARGS__)
+RKlcl_log(RKLogComponent, RKlcl_vWarning, @"" __VA_ARGS__)
 
 #define RKLogInfo(...)                                                                  \
-lcl_log(RKLogComponent, lcl_vInfo, @"" __VA_ARGS__)
+RKlcl_log(RKLogComponent, RKlcl_vInfo, @"" __VA_ARGS__)
 
 #define RKLogDebug(...)                                                                 \
-lcl_log(RKLogComponent, lcl_vDebug, @"" __VA_ARGS__)
+RKlcl_log(RKLogComponent, RKlcl_vDebug, @"" __VA_ARGS__)
 
 #define RKLogTrace(...)                                                                 \
-lcl_log(RKLogComponent, lcl_vTrace, @"" __VA_ARGS__)
+RKlcl_log(RKLogComponent, RKlcl_vTrace, @"" __VA_ARGS__)
 
 /**
  Log Level Aliases
 
  These aliases simply map the log levels defined within LibComponentLogger to something more friendly
  */
-#define RKLogLevelOff       lcl_vOff
-#define RKLogLevelCritical  lcl_vCritical
-#define RKLogLevelError     lcl_vError
-#define RKLogLevelWarning   lcl_vWarning
-#define RKLogLevelInfo      lcl_vInfo
-#define RKLogLevelDebug     lcl_vDebug
-#define RKLogLevelTrace     lcl_vTrace
+#define RKLogLevelOff       RKlcl_vOff
+#define RKLogLevelCritical  RKlcl_vCritical
+#define RKLogLevelError     RKlcl_vError
+#define RKLogLevelWarning   RKlcl_vWarning
+#define RKLogLevelInfo      RKlcl_vInfo
+#define RKLogLevelDebug     RKlcl_vDebug
+#define RKLogLevelTrace     RKlcl_vTrace
 
 /**
  Alias the LibComponentLogger logging configuration method. Also ensures logging
@@ -107,7 +107,7 @@ lcl_log(RKLogComponent, lcl_vTrace, @"" __VA_ARGS__)
  */
 #define RKLogConfigureByName(name, level)                                               \
 RKLogInitialize();                                                                      \
-lcl_configure_by_name(name, level);
+RKlcl_configure_by_name(name, level);
 
 /**
  Alias for configuring the LibComponentLogger logging component for the App. This
@@ -116,7 +116,7 @@ lcl_configure_by_name(name, level);
  */
 #define RKLogSetAppLoggingLevel(level)                                                  \
 RKLogInitialize();                                                                      \
-lcl_configure_by_name("App", level);
+RKlcl_configure_by_name("App", level);
 
 /**
  Temporarily changes the logging level for the specified component and executes the block. Any logging
@@ -125,16 +125,16 @@ lcl_configure_by_name("App", level);
  */
 #define RKLogToComponentWithLevelWhileExecutingBlock(_component, _level, _block)        \
     do {                                                                                \
-        int _currentLevel = _lcl_component_level[_component];                           \
-        lcl_configure_by_component(_component, _level);                                 \
+        int _currentLevel = _RKlcl_component_level[_component];                           \
+        RKlcl_configure_by_component(_component, _level);                                 \
         @try {                                                                          \
             _block();                                                                   \
         }                                                                               \
         @catch (NSException *exception) {                                               \
             @throw;                                                                     \
         }                                                                               \
         @finally {                                                                      \
-            lcl_configure_by_component(_component, _currentLevel);                      \
+            RKlcl_configure_by_component(_component, _currentLevel);                      \
         }                                                                               \
     } while (false);
 
@@ -192,7 +192,7 @@ void RKLogInitialize(void);
 
  Define an environment variable named RKLogLevel.RestKit.Network and set its value to "Trace"
 
- See lcl_config_components.h for configurable RestKit logging components.
+ See lcl_config_components_RK.h for configurable RestKit logging components.
 
  Valid values are the following:
     Default  or 0

diff --git a/Code/Support/RKLog.m b/Code/Support/RKLog.m
@@ -27,8 +27,8 @@
 void RKLogInitialize(void)
 {
     if (loggingInitialized == NO) {
-        lcl_configure_by_name("RestKit*", RKLogLevelDefault);
-        lcl_configure_by_name("App", RKLogLevelDefault);
+        RKlcl_configure_by_name("RestKit*", RKLogLevelDefault);
+        RKlcl_configure_by_name("App", RKLogLevelDefault);
         RKLogInfo(@"RestKit initialized...");
         loggingInitialized = YES;
     }
@@ -152,7 +152,7 @@ void RKLogIntegerAsBinary(NSUInteger bitMask)
 
 void RKLogCoreDataError(NSError *error)
 {
-    RKLogToComponentWithLevelWhileExecutingBlock(lcl_cRestKitCoreData, RKLogLevelError, ^{
+    RKLogToComponentWithLevelWhileExecutingBlock(RKlcl_cRestKitCoreData, RKLogLevelError, ^{
         RKLogValidationError(error);
     });
 }
diff --git a/Code/Support/RKMIMETypeSerialization.m b/Code/Support/RKMIMETypeSerialization.m
@@ -26,7 +26,7 @@
 
 // Define logging component
 #undef RKLogComponent
-#define RKLogComponent lcl_cRestKitSupport
+#define RKLogComponent RKlcl_cRestKitSupport
 
 @interface RKMIMETypeSerializationRegistration : NSObject