Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit 17c9b45

Browse files
geof90geof90
authored
Merge pull request #405 from Microsoft/CPLog
Prepend iOS native logs with "\n[CodePush] "
2 parents 6a987ed + 2d337b3 commit 17c9b45

File tree

5 files changed

+27
-12
lines changed

5 files changed

+27
-12
lines changed

‎ios/CodePush.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
1BCC09A71CC19EB700DDC0DD /* RCTConvert+CodePushUpdateState.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BCC09A61CC19EB700DDC0DD /* RCTConvert+CodePushUpdateState.m */; };
1414
540D20121C7684FE00D6EF41 /* CodePushUpdateUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 540D20111C7684FE00D6EF41 /* CodePushUpdateUtils.m */; };
1515
5421FE311C58AD5A00986A55 /* CodePushTelemetryManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5421FE301C58AD5A00986A55 /* CodePushTelemetryManager.m */; };
16+
5498D8F61D21F14100B5EB43 /* CodePushUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 5498D8F51D21F14100B5EB43 /* CodePushUtils.m */; };
1617
54A0026C1C0E2880004C3CEC /* aescrypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 54A0024C1C0E2880004C3CEC /* aescrypt.c */; };
1718
54A0026D1C0E2880004C3CEC /* aeskey.c in Sources */ = {isa = PBXBuildFile; fileRef = 54A0024D1C0E2880004C3CEC /* aeskey.c */; };
1819
54A0026E1C0E2880004C3CEC /* aestab.c in Sources */ = {isa = PBXBuildFile; fileRef = 54A0024F1C0E2880004C3CEC /* aestab.c */; };
@@ -53,6 +54,7 @@
5354
1BCC09A61CC19EB700DDC0DD /* RCTConvert+CodePushUpdateState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "RCTConvert+CodePushUpdateState.m"; path = "CodePush/RCTConvert+CodePushUpdateState.m"; sourceTree = "<group>"; };
5455
540D20111C7684FE00D6EF41 /* CodePushUpdateUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodePushUpdateUtils.m; path = CodePush/CodePushUpdateUtils.m; sourceTree = "<group>"; };
5556
5421FE301C58AD5A00986A55 /* CodePushTelemetryManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodePushTelemetryManager.m; path = CodePush/CodePushTelemetryManager.m; sourceTree = "<group>"; };
57+
5498D8F51D21F14100B5EB43 /* CodePushUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodePushUtils.m; path = CodePush/CodePushUtils.m; sourceTree = "<group>"; };
5658
54A0024A1C0E2880004C3CEC /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = "<group>"; };
5759
54A0024B1C0E2880004C3CEC /* aes_via_ace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes_via_ace.h; sourceTree = "<group>"; };
5860
54A0024C1C0E2880004C3CEC /* aescrypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aescrypt.c; sourceTree = "<group>"; };
@@ -170,6 +172,7 @@
170172
58B511D21A9E6C8500147676 = {
171173
isa = PBXGroup;
172174
children = (
175+
5498D8F51D21F14100B5EB43 /* CodePushUtils.m */,
173176
13BE3DEC1AC21097009241FE /* CodePush.h */,
174177
13BE3DED1AC21097009241FE /* CodePush.m */,
175178
81D51F391B6181C2000DA084 /* CodePushConfig.m */,
@@ -263,6 +266,7 @@
263266
54A0026C1C0E2880004C3CEC /* aescrypt.c in Sources */,
264267
1B762E901C9A5E9A006EF800 /* CodePushErrorUtils.m in Sources */,
265268
54A002701C0E2880004C3CEC /* fileenc.c in Sources */,
269+
5498D8F61D21F14100B5EB43 /* CodePushUtils.m in Sources */,
266270
810D4E6D1B96935000B397E9 /* CodePushPackage.m in Sources */,
267271
);
268272
runOnlyForDeploymentPostprocessing = 0;

‎ios/CodePush/CodePush.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ failCallback:(void (^)(NSError *err))failCallback;
143143

144144
@end
145145

146+
void CPLog(NSString *formatString, ...);
147+
146148
typedef NS_ENUM(NSInteger, CodePushInstallMode) {
147149
CodePushInstallModeImmediate,
148150
CodePushInstallModeOnNextRestart,

‎ios/CodePush/CodePush.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
9191
NSURL *binaryBundleURL = [self binaryBundleURL];
9292

9393
if (error || !packageFile) {
94-
NSLog(logMessageFormat, binaryBundleURL);
94+
CPLog(logMessageFormat, binaryBundleURL);
9595
isRunningBinaryVersion = YES;
9696
return binaryBundleURL;
9797
}
9898

9999
NSString *binaryAppVersion = [[CodePushConfig current] appVersion];
100100
NSDictionary *currentPackageMetadata = [CodePushPackage getCurrentPackage:&error];
101101
if (error || !currentPackageMetadata) {
102-
NSLog(logMessageFormat, binaryBundleURL);
102+
CPLog(logMessageFormat, binaryBundleURL);
103103
isRunningBinaryVersion = YES;
104104
return binaryBundleURL;
105105
}
@@ -110,7 +110,7 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
110110
if ([[CodePushUpdateUtils modifiedDateStringOfFileAtURL:binaryBundleURL] isEqualToString:packageDate] && ([CodePush isUsingTestConfiguration] ||[binaryAppVersion isEqualToString:packageAppVersion])) {
111111
// Return package file because it is newer than the app store binary's JS bundle
112112
NSURL *packageUrl = [[NSURL alloc] initFileURLWithPath:packageFile];
113-
NSLog(logMessageFormat, packageUrl);
113+
CPLog(logMessageFormat, packageUrl);
114114
isRunningBinaryVersion = NO;
115115
return packageUrl;
116116
} else {
@@ -123,7 +123,7 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
123123
[CodePush clearUpdates];
124124
}
125125

126-
NSLog(logMessageFormat, binaryBundleURL);
126+
CPLog(logMessageFormat, binaryBundleURL);
127127
isRunningBinaryVersion = YES;
128128
return binaryBundleURL;
129129
}
@@ -310,7 +310,7 @@ - (void)initializeUpdateAfterRestart
310310
if (updateIsLoading) {
311311
// Pending update was initialized, but notifyApplicationReady was not called.
312312
// Therefore, deduce that it is a broken update and rollback.
313-
NSLog(@"Update did not finish loading the last time, rolling back to a previous version.");
313+
CPLog(@"Update did not finish loading the last time, rolling back to a previous version.");
314314
needToReportRollback = YES;
315315
[self rollbackPackage];
316316
} else {
@@ -582,7 +582,7 @@ - (void)applicationWillResignActive
582582
// isRunningBinaryVersion will not get set to "YES" if running against the packager.
583583
NSString *binaryHash = [CodePushUpdateUtils getHashForBinaryContents:[CodePush binaryBundleURL] error:&error];
584584
if (error) {
585-
NSLog(@"Error obtaining hash for binary contents: %@", error);
585+
CPLog(@"Error obtaining hash for binary contents: %@", error);
586586
resolve(configuration);
587587
return;
588588
}

‎ios/CodePush/CodePushPackage.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ + (void)downloadAndReplaceCurrentBundle:(NSString *)remoteBundleUrl
2929
error:&error];
3030

3131
if (error) {
32-
NSLog(@"Error downloading from URL %@", remoteBundleUrl);
32+
CPLog(@"Error downloading from URL %@", remoteBundleUrl);
3333
} else {
3434
NSString *currentPackageBundlePath = [self getCurrentPackageBundlePath:&error];
3535
[downloadedBundle writeToFile:currentPackageBundlePath
@@ -101,7 +101,7 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
101101
[[NSFileManager defaultManager] removeItemAtPath:downloadFilePath
102102
error:&nonFailingError];
103103
if (nonFailingError) {
104-
NSLog(@"Error deleting downloaded file: %@", nonFailingError);
104+
CPLog(@"Error deleting downloaded file: %@", nonFailingError);
105105
nonFailingError = nil;
106106
}
107107

@@ -198,7 +198,7 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
198198
[[NSFileManager defaultManager] removeItemAtPath:unzippedFolderPath
199199
error:&nonFailingError];
200200
if (nonFailingError) {
201-
NSLog(@"Error deleting downloaded file: %@", nonFailingError);
201+
CPLog(@"Error deleting downloaded file: %@", nonFailingError);
202202
nonFailingError = nil;
203203
}
204204

@@ -462,7 +462,7 @@ + (void)installPackage:(NSDictionary *)updatePackage
462462
[[NSFileManager defaultManager] removeItemAtPath:currentPackageFolderPath
463463
error:&deleteError];
464464
if (deleteError) {
465-
NSLog(@"Error deleting pending package: %@", deleteError);
465+
CPLog(@"Error deleting pending package: %@", deleteError);
466466
}
467467
}
468468
} else {
@@ -474,7 +474,7 @@ + (void)installPackage:(NSDictionary *)updatePackage
474474
[[NSFileManager defaultManager] removeItemAtPath:previousPackageFolderPath
475475
error:&deleteError];
476476
if (deleteError) {
477-
NSLog(@"Error deleting old package: %@", deleteError);
477+
CPLog(@"Error deleting old package: %@", deleteError);
478478
}
479479
}
480480
[info setValue:info[@"currentPackage"] forKey:@"previousPackage"];
@@ -503,7 +503,7 @@ + (void)rollbackPackage
503503
[[NSFileManager defaultManager] removeItemAtPath:currentPackageFolderPath
504504
error:&deleteError];
505505
if (deleteError) {
506-
NSLog(@"Error deleting current package contents at %@", currentPackageFolderPath);
506+
CPLog(@"Error deleting current package contents at %@", currentPackageFolderPath);
507507
}
508508

509509
[info setValue:info[@"previousPackage"] forKey:@"currentPackage"];

‎ios/CodePush/CodePushUtils.m

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#import "CodePush.h"
2+
3+
void CPLog(NSString *formatString, ...) {
4+
va_list args;
5+
va_start(args, formatString);
6+
NSString *prependedFormatString = [NSString stringWithFormat:@"\n[CodePush] %@", formatString];
7+
NSLogv(prependedFormatString, args);
8+
va_end(args);
9+
}

0 commit comments

Comments
 (0)