Skip to content
This repository was archived by the owner on Oct 29, 2021. It is now read-only.

Commit 062b827

Browse files
author
Alex Rupérez
committed
Added LogManager using XCGLogger
1 parent 5529e23 commit 062b827

File tree

82 files changed

+7804
-1190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+7804
-1190
lines changed

‎Archit.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
810963E51FB0C42E00B35959 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810963E41FB0C42E00B35959 /* AppDelegate.swift */; };
2626
810963F81FB0C42E00B35959 /* ArchitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810963F71FB0C42E00B35959 /* ArchitTests.swift */; };
2727
810964031FB0C42E00B35959 /* ArchitUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810964021FB0C42E00B35959 /* ArchitUITests.swift */; };
28+
817ED3511FBDE6D90066A679 /* LogManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 817ED3501FBDE6D90066A679 /* LogManager.swift */; };
29+
817ED3541FBDE7BE0066A679 /* LogManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 817ED3501FBDE6D90066A679 /* LogManager.swift */; };
30+
817ED3551FBDE7C00066A679 /* LogManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 817ED3501FBDE6D90066A679 /* LogManager.swift */; };
2831
8374FD19ACE27BF2EEF1BADF /* Pods_Domain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5070463760B7BEFCBFA8995E /* Pods_Domain.framework */; };
2932
9AC00EF4802746D651A3FFE3 /* Pods_CoreTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B55B0227AAC528CF431AFE3 /* Pods_CoreTests.framework */; };
3033
A4D041333F586D156E01B44E /* Pods_Archit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51036FE5FB812710D2B3A0F7 /* Pods_Archit.framework */; };
@@ -193,6 +196,7 @@
193196
810963FE1FB0C42E00B35959 /* ArchitUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ArchitUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
194197
810964021FB0C42E00B35959 /* ArchitUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchitUITests.swift; sourceTree = "<group>"; };
195198
810964041FB0C42E00B35959 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
199+
817ED3501FBDE6D90066A679 /* LogManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = LogManager.swift; path = Source/Managers/LogManager.swift; sourceTree = "<group>"; };
196200
9E13B6F1A1B652AB4AD62B18 /* Pods-Domain.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Domain.release.xcconfig"; path = "Pods/Target Support Files/Pods-Domain/Pods-Domain.release.xcconfig"; sourceTree = "<group>"; };
197201
A73079477914B6D127E59CB7 /* Pods_DomainTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DomainTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
198202
AE55A12BF45485A5033F2DAC /* Pods_ArchitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ArchitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -467,6 +471,7 @@
467471
isa = PBXGroup;
468472
children = (
469473
810963DB1FB0C42E00B35959 /* AppManager.swift */,
474+
817ED3501FBDE6D90066A679 /* LogManager.swift */,
470475
);
471476
name = Managers;
472477
sourceTree = "<group>";
@@ -954,10 +959,14 @@
954959
);
955960
inputPaths = (
956961
"${SRCROOT}/Pods/Target Support Files/Pods-CoreTests/Pods-CoreTests-frameworks.sh",
962+
"${BUILT_PRODUCTS_DIR}/ObjcExceptionBridging/ObjcExceptionBridging.framework",
963+
"${BUILT_PRODUCTS_DIR}/XCGLogger/XCGLogger.framework",
957964
"${BUILT_PRODUCTS_DIR}/NetClient/Net.framework",
958965
);
959966
name = "[CP] Embed Pods Frameworks";
960967
outputPaths = (
968+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjcExceptionBridging.framework",
969+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XCGLogger.framework",
961970
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Net.framework",
962971
);
963972
runOnlyForDeploymentPostprocessing = 0;
@@ -1019,14 +1028,18 @@
10191028
"${SRCROOT}/Pods/Target Support Files/Pods-Archit/Pods-Archit-frameworks.sh",
10201029
"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
10211030
"${BUILT_PRODUCTS_DIR}/Kommander/Kommander.framework",
1031+
"${BUILT_PRODUCTS_DIR}/ObjcExceptionBridging/ObjcExceptionBridging.framework",
10221032
"${BUILT_PRODUCTS_DIR}/Reusable/Reusable.framework",
1033+
"${BUILT_PRODUCTS_DIR}/XCGLogger/XCGLogger.framework",
10231034
"${BUILT_PRODUCTS_DIR}/NetClient/Net.framework",
10241035
);
10251036
name = "[CP] Embed Pods Frameworks";
10261037
outputPaths = (
10271038
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework",
10281039
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kommander.framework",
1040+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjcExceptionBridging.framework",
10291041
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reusable.framework",
1042+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XCGLogger.framework",
10301043
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Net.framework",
10311044
);
10321045
runOnlyForDeploymentPostprocessing = 0;
@@ -1109,9 +1122,14 @@
11091122
files = (
11101123
);
11111124
inputPaths = (
1125+
"${SRCROOT}/Pods/Target Support Files/Pods-DomainTests/Pods-DomainTests-frameworks.sh",
1126+
"${BUILT_PRODUCTS_DIR}/ObjcExceptionBridging/ObjcExceptionBridging.framework",
1127+
"${BUILT_PRODUCTS_DIR}/XCGLogger/XCGLogger.framework",
11121128
);
11131129
name = "[CP] Embed Pods Frameworks";
11141130
outputPaths = (
1131+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjcExceptionBridging.framework",
1132+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XCGLogger.framework",
11151133
);
11161134
runOnlyForDeploymentPostprocessing = 0;
11171135
shellPath = /bin/sh;
@@ -1168,13 +1186,13 @@
11681186
);
11691187
inputPaths = (
11701188
"${SRCROOT}/Pods/Target Support Files/Pods-ArchitTests/Pods-ArchitTests-frameworks.sh",
1171-
"${BUILT_PRODUCTS_DIR}/Kommander/Kommander.framework",
1172-
"${BUILT_PRODUCTS_DIR}/NetClient/Net.framework",
1189+
"${BUILT_PRODUCTS_DIR}/ObjcExceptionBridging/ObjcExceptionBridging.framework",
1190+
"${BUILT_PRODUCTS_DIR}/XCGLogger/XCGLogger.framework",
11731191
);
11741192
name = "[CP] Embed Pods Frameworks";
11751193
outputPaths = (
1176-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kommander.framework",
1177-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Net.framework",
1194+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjcExceptionBridging.framework",
1195+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XCGLogger.framework",
11781196
);
11791197
runOnlyForDeploymentPostprocessing = 0;
11801198
shellPath = /bin/sh;
@@ -1275,10 +1293,14 @@
12751293
);
12761294
inputPaths = (
12771295
"${SRCROOT}/Pods/Target Support Files/Pods-ArchitUITests/Pods-ArchitUITests-frameworks.sh",
1296+
"${BUILT_PRODUCTS_DIR}/ObjcExceptionBridging/ObjcExceptionBridging.framework",
1297+
"${BUILT_PRODUCTS_DIR}/XCGLogger/XCGLogger.framework",
12781298
"${BUILT_PRODUCTS_DIR}/Cucumberish/Cucumberish.framework",
12791299
);
12801300
name = "[CP] Embed Pods Frameworks";
12811301
outputPaths = (
1302+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjcExceptionBridging.framework",
1303+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XCGLogger.framework",
12821304
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cucumberish.framework",
12831305
);
12841306
runOnlyForDeploymentPostprocessing = 0;
@@ -1293,6 +1315,7 @@
12931315
isa = PBXSourcesBuildPhase;
12941316
buildActionMask = 2147483647;
12951317
files = (
1318+
817ED3541FBDE7BE0066A679 /* LogManager.swift in Sources */,
12961319
D5FF818E1FB8AFD600EAC050 /* NetworkServiceConstants.swift in Sources */,
12971320
D582F4581FB61C56002BDB91 /* FilmsNetworkTransformer.swift in Sources */,
12981321
D582F4491FB38CF1002BDB91 /* NetworkService.swift in Sources */,
@@ -1324,6 +1347,7 @@
13241347
isa = PBXSourcesBuildPhase;
13251348
buildActionMask = 2147483647;
13261349
files = (
1350+
817ED3551FBDE7C00066A679 /* LogManager.swift in Sources */,
13271351
D582F4601FB62207002BDB91 /* Film.swift in Sources */,
13281352
);
13291353
runOnlyForDeploymentPostprocessing = 0;
@@ -1342,6 +1366,7 @@
13421366
files = (
13431367
D582F4311FB2273A002BDB91 /* FilmsViewController.swift in Sources */,
13441368
810963E51FB0C42E00B35959 /* AppDelegate.swift in Sources */,
1369+
817ED3511FBDE6D90066A679 /* LogManager.swift in Sources */,
13451370
D582F4321FB2273A002BDB91 /* FilmsController.swift in Sources */,
13461371
810963DC1FB0C42E00B35959 /* AppManager.swift in Sources */,
13471372
D582F4341FB22761002BDB91 /* UITableView+Reusable.swift in Sources */,
@@ -1452,10 +1477,11 @@
14521477
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
14531478
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
14541479
CODE_SIGN_IDENTITY = "iPhone Developer";
1480+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14551481
CODE_SIGN_STYLE = Automatic;
14561482
CURRENT_PROJECT_VERSION = 1;
14571483
DEFINES_MODULE = YES;
1458-
DEVELOPMENT_TEAM = 3VW789WSMP;
1484+
DEVELOPMENT_TEAM = "";
14591485
DYLIB_COMPATIBILITY_VERSION = 1;
14601486
DYLIB_CURRENT_VERSION = 1;
14611487
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1465,6 +1491,7 @@
14651491
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14661492
PRODUCT_BUNDLE_IDENTIFIER = com.intelygenz.Archit.Core;
14671493
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
1494+
PROVISIONING_PROFILE_SPECIFIER = "";
14681495
SKIP_INSTALL = YES;
14691496
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
14701497
SWIFT_VERSION = 4.0;
@@ -1485,10 +1512,11 @@
14851512
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
14861513
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
14871514
CODE_SIGN_IDENTITY = "iPhone Developer";
1515+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14881516
CODE_SIGN_STYLE = Automatic;
14891517
CURRENT_PROJECT_VERSION = 1;
14901518
DEFINES_MODULE = YES;
1491-
DEVELOPMENT_TEAM = 3VW789WSMP;
1519+
DEVELOPMENT_TEAM = "";
14921520
DYLIB_COMPATIBILITY_VERSION = 1;
14931521
DYLIB_CURRENT_VERSION = 1;
14941522
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1498,6 +1526,7 @@
14981526
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14991527
PRODUCT_BUNDLE_IDENTIFIER = com.intelygenz.Archit.Core;
15001528
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
1529+
PROVISIONING_PROFILE_SPECIFIER = "";
15011530
SKIP_INSTALL = YES;
15021531
SWIFT_VERSION = 4.0;
15031532
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1565,10 +1594,11 @@
15651594
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
15661595
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
15671596
CODE_SIGN_IDENTITY = "iPhone Developer";
1597+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
15681598
CODE_SIGN_STYLE = Automatic;
15691599
CURRENT_PROJECT_VERSION = 1;
15701600
DEFINES_MODULE = YES;
1571-
DEVELOPMENT_TEAM = 3VW789WSMP;
1601+
DEVELOPMENT_TEAM = "";
15721602
DYLIB_COMPATIBILITY_VERSION = 1;
15731603
DYLIB_CURRENT_VERSION = 1;
15741604
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1578,6 +1608,7 @@
15781608
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
15791609
PRODUCT_BUNDLE_IDENTIFIER = com.intelygenz.Archit.Domain;
15801610
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
1611+
PROVISIONING_PROFILE_SPECIFIER = "";
15811612
SKIP_INSTALL = YES;
15821613
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
15831614
SWIFT_VERSION = 4.0;
@@ -1598,10 +1629,11 @@
15981629
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
15991630
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
16001631
CODE_SIGN_IDENTITY = "iPhone Developer";
1632+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
16011633
CODE_SIGN_STYLE = Automatic;
16021634
CURRENT_PROJECT_VERSION = 1;
16031635
DEFINES_MODULE = YES;
1604-
DEVELOPMENT_TEAM = 3VW789WSMP;
1636+
DEVELOPMENT_TEAM = "";
16051637
DYLIB_COMPATIBILITY_VERSION = 1;
16061638
DYLIB_CURRENT_VERSION = 1;
16071639
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1611,6 +1643,7 @@
16111643
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
16121644
PRODUCT_BUNDLE_IDENTIFIER = com.intelygenz.Archit.Domain;
16131645
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
1646+
PROVISIONING_PROFILE_SPECIFIER = "";
16141647
SKIP_INSTALL = YES;
16151648
SWIFT_VERSION = 4.0;
16161649
TARGETED_DEVICE_FAMILY = "1,2";

‎Archit/Source/Managers/LogManager.swift‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// LogManager.swift
2+
// Created by Alex Rupérez on 16/11/17.
3+
// Copyright © 2017 Intelygenz. All rights reserved.
4+
5+
import XCGLogger
6+
7+
let log: XCGLogger = {
8+
let log = XCGLogger(identifier: "advancedLogger", includeDefaultDestinations: false)
9+
log.levelDescriptions[.verbose] = "💜"
10+
log.levelDescriptions[.debug] = "💚"
11+
log.levelDescriptions[.info] = "💙"
12+
log.levelDescriptions[.warning] = "💛"
13+
log.levelDescriptions[.error] = "❤️"
14+
log.levelDescriptions[.severe] = "🖤"
15+
16+
let consoleDestination = ConsoleDestination(identifier: "advancedLogger.consoleDestination")
17+
#if DEBUG
18+
consoleDestination.outputLevel = .debug
19+
#else
20+
consoleDestination.outputLevel = .severe
21+
#endif
22+
consoleDestination.showFunctionName = false
23+
consoleDestination.showFileName = false
24+
consoleDestination.showLineNumber = false
25+
log.add(destination: consoleDestination)
26+
27+
return log
28+
}()

‎Core/Tasks/ServiceTask.swift‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,21 @@ open class ServiceTask: ServiceTaskProtocol {
99
private static let net: Net = {
1010
let net = NetURLSession()
1111
net.addRequestInterceptor { requestBuilder in
12-
return requestBuilder.addURLParameter(NetworkServiceConstants.Parameters.key, value: NetworkServiceConstants.Values.key)
12+
requestBuilder.addURLParameter(NetworkServiceConstants.Parameters.key, value: NetworkServiceConstants.Values.key)
1313
.addURLParameter(NetworkServiceConstants.Parameters.format, value: NetworkServiceConstants.Values.Format.json.rawValue)
1414
.addURLParameter(NetworkServiceConstants.Parameters.version, value: NetworkServiceConstants.Values.version)
15+
log.debug(requestBuilder.build().debugDescription)
16+
return requestBuilder
17+
}
18+
net.addResponseInterceptor { responseBuilder in
19+
let response = responseBuilder.build()
20+
log.debug(response.debugDescription)
21+
do {
22+
if let responseObject: [AnyHashable: Any] = try response.object() {
23+
log.verbose(responseObject)
24+
}
25+
} catch {}
26+
return responseBuilder
1527
}
1628
return net
1729
}()

‎Podfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use_frameworks!
33
inhibit_all_warnings!
44

55
pod 'SwiftLint'
6+
pod 'XCGLogger'
67

78
target 'Archit' do
89

‎Podfile.lock‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,19 @@ PODS:
88
- NetClient/Core (0.3.5)
99
- NetClient/URLSession (0.3.5):
1010
- NetClient/Core
11+
- ObjcExceptionBridging (1.0.1):
12+
- ObjcExceptionBridging/ObjcExceptionBridging (= 1.0.1)
13+
- ObjcExceptionBridging/ObjcExceptionBridging (1.0.1)
1114
- Reusable (4.0.0):
1215
- Reusable/Storyboard (= 4.0.0)
1316
- Reusable/View (= 4.0.0)
1417
- Reusable/Storyboard (4.0.0)
1518
- Reusable/View (4.0.0)
1619
- SwiftLint (0.24.0)
20+
- XCGLogger (6.0.1):
21+
- XCGLogger/Core (= 6.0.1)
22+
- XCGLogger/Core (6.0.1):
23+
- ObjcExceptionBridging
1724

1825
DEPENDENCIES:
1926
- Cucumberish
@@ -22,15 +29,18 @@ DEPENDENCIES:
2229
- NetClient
2330
- Reusable
2431
- SwiftLint
32+
- XCGLogger
2533

2634
SPEC CHECKSUMS:
2735
Cucumberish: 76f542be7b62b1a01ebc6f968be3e002f9403931
2836
Kingfisher: 9ee7e788d8ba07c3f21ce0d43f33cec310a4f781
2937
Kommander: 34bf09d910308fbfd584234896e6e25931b752ff
3038
NetClient: 99cbb60c94c195666fcf723213deff4213f198a7
39+
ObjcExceptionBridging: c30e00eb3700467e695faeea30e26e18bd445001
3140
Reusable: 98e5fff1e0e2e00872199699b276dde08ee56c07
3241
SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
42+
XCGLogger: b4ca980580108cfeaf221afe158f5d89c1be22e0
3343

34-
PODFILE CHECKSUM: 76fd68a25130619b340a1fb7194b6a4f7049924c
44+
PODFILE CHECKSUM: 6e863f7f984be258f0a4db40f1efedf01540a387
3545

3646
COCOAPODS: 1.3.1

‎Pods/Manifest.lock‎

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/ObjcExceptionBridging/LICENSE.txt‎

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)