8000 Update ObjC tutorials to run with v0.7 · syk-coder/rabbitmq-tutorials@3d56cb2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3d56cb2

Browse files
camelpunchcamelpunch
committed
Update ObjC tutorials to run with v0.7
Make them more reliable by: - Sharing connection between send / receive in 4 & 5 - Increase sleeps in 4 & 5 [#120637007]
1 parent 111c430 commit 3d56cb2

File tree

15 files changed

+41
-52
lines changed

15 files changed

+41
-52
lines changed

‎objective-c/tutorial1/Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
1+
github "rabbitmq/rabbitmq-objc-client" "v0.7"

‎objective-c/tutorial1/Cartfile.resolved

Lines changed: 2 additions & 2 deletions
< 10000 /table>

‎objective-c/tutorial1/tutorial1/ViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "robbiehanson/CocoaAsyncSocket" "7.4.3"
2-
github "Mantle/Mantle" "2.0.7"
3-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
2+
github "jeffh/JKVValue" "v1.3.1"
3+
github "rabbitmq/rabbitmq-objc-client" "v0.7"
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ - (void)receive {
3636

3737
RMQQueue *q = [ch queue:@"hello"];
3838
NSLog(@"Waiting for messages.");
39-
[q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
39+
[q subscribe:^(RMQMessage * _Nonnull message) {
4040
NSLog(@"Received %@", message.content);
4141
}];
4242
}

‎objective-c/tutorial2/Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
1+
github "rabbitmq/rabbitmq-objc-client" "v0.7"

‎objective-c/tutorial2/Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "robbiehanson/CocoaAsyncSocket" "7.4.3"
2-
github "Mantle/Mantle" "2.0.7"
3-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
2+
github "jeffh/JKVValue" "v1.3.1"
3+
github "rabbitmq/rabbitmq-objc-client" "v0.7"

‎objective-c/tutorial2/tutorial2/ViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ - (void)workerNamed:(NSString *)name {
4444
NSLog(@"%@: Waiting for messages", name);
4545

4646
RMQBasicConsumeOptions manualAck = RMQBasicConsumeNoOptions;
47-
[q subscribe:manualAck handler:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
47+
[q subscribe:manualAck handler:^(RMQMessage * _Nonnull message) {
4848
NSLog(@"%@: Received %@", name, message.content);
4949
// imitate some work
5050
unsigned int sleepTime = (unsigned int)[message.content componentsSeparatedByString:@"."].count - 1;

‎objective-c/tutorial3/Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
1+
github "rabbitmq/rabbitmq-objc-client" "v0.7"

‎objective-c/tutorial3/Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "robbiehanson/CocoaAsyncSocket" "7.4.3"
2-
github "Mantle/Mantle" "2.0.7"
3-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
2+
github "jeffh/JKVValue" "v1.3.1"
3+
github "rabbitmq/rabbitmq-objc-client" "v0.7"

‎objective-c/tutorial3/tutorial3/ViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ - (void)receiveLogs {
4242

4343
NSLog(@"Waiting for logs.");
4444

45-
[q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
45+
[q subscribe:^(RMQMessage * _Nonnull message) {
4646
NSLog(@"Received %@", message);
4747
}];
4848
}

‎objective-c/tutorial4/Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
1+
github "rabbitmq/rabbitmq-objc-client" "v0.7"

‎objective-c/tutorial4/Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "robbiehanson/CocoaAsyncSocket" "7.4.3"
2-
github "Mantle/Mantle" "2.0.7"
3-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
2+
github "jeffh/JKVValue" "v1.3.1"
3+
github "rabbitmq/rabbitmq-objc-client" "v0.7"

‎objective-c/tutorial4/tutorial4/ViewController.m

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ @implementation ViewController
99

1010
- (void)viewDidLoad {
1111
[super viewDidLoad];
12-
[self receiveLogsDirect];
13-
sleep(1);
14-
[self emitLogDirect:@"Hello World!" severity:@"info"];
15-
[self emitLogDirect:@"Missile button pressed" severity:@"warning"];
16-
[self emitLogDirect:@"Launch mechanism jammed" severity:@"error"];
17-
}
18-
19-
- (void)receiveLogsDirect {
2012
RMQConnection *conn = [[RMQConnection alloc] initWithDelegate:[RMQConnectionDelegateLogger new]];
2113
[conn start];
2214

15+
[self receiveLogsDirect:conn];
16+
sleep(2);
17+
[self emitLogDirect:conn message:@"Hello World!" severity:@"info"];
18+
[self emitLogDirect:conn message:@"Missile button pressed" severity:@"warning"];
19+
[self emitLogDirect:conn message:@"Launch mechanism jammed" severity:@"error"];
20+
}
21+
22+
- (void)receiveLogsDirect:(RMQConnection *)conn {
2323
id<RMQChannel> ch = [conn createChannel];
2424
RMQExchange *x = [ch direct:@"direct_logs"];
2525
RMQQueue *q = [ch queue:@"" options:RMQQueueDeclareExclusive];
@@ -31,22 +31,17 @@ - (void)receiveLogsDirect {
3131

3232
NSLog(@"Waiting for logs.");
3333

34-
[q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
35-
NSLog(@"%@:%@", deliveryInfo.routingKey, message.content);
34+
[q subscribe:^(RMQMessage * _Nonnull message) {
35+
NSLog(@"%@:%@", message.routingKey, message.content);
3636
}];
3737
}
3838

39-
- (void)emitLogDirect:(NSString *)msg severity:(NSString *)severity {
40-
RMQConnection *conn = [[RMQConnection alloc] initWithDelegate:[RMQConnectionDelegateLogger new]];
41-
[conn start];
42-
39+
- (void)emitLogDirect:(RMQConnection *)conn message:(NSString *)msg severity:(NSString *)severity {
4340
id<RMQChannel> ch = [conn createChannel];
4441
RMQExchange *x = [ch direct:@"direct_logs"];
4542

4643
[x publish:msg routingKey:severity];
4744
NSLog(@"Sent '%@'", msg);
48-
49-
[conn close];
5045
}
5146

5247
@end

‎objective-c/tutorial5/Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
1+
github "rabbitmq/rabbitmq-objc-client" "v0.7"

‎objective-c/tutorial5/Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "robbiehanson/CocoaAsyncSocket" "7.4.3"
2-
github "Mantle/Mantle" "2.0.7"
3-
github "rabbitmq/rabbitmq-objc-client" "v0.6.1"
2+
github "jeffh/JKVValue" "v1.3.1"
3+
github "rabbitmq/rabbitmq-objc-client" "v0.7"

‎objective-c/tutorial5/tutorial5/ViewController.m

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,18 @@ @implementation ViewController
99

1010
- (void)viewDidLoad {
1111
[super viewDidLoad];
12-
13-
[self receiveLogsTopic:@[@"kern.*", @"*.critical"]];
14-
sleep(1);
15-
[self emitLogTopic:@"Hello World!" routingKey:@"kern.info"];
16-
[self emitLogTopic:@"A critical kernel error" routingKey:@"kern.critical"];
17-
[self emitLogTopic:@"Critical module error" routingKey:@"somemod.critical"];
18-
[self emitLogTopic:@"Just some module info. You won't get this." routingKey:@"somemod.info"];
19-
}
20-
21-
- (void)receiveLogsTopic:(NSArray *)routingKeys {
2212
RMQConnection *conn = [[RMQConnection alloc] initWithDelegate:[RMQConnectionDelegateLogger new]];
2313
[conn start];
2414

15+
[self receiveLogsTopic:conn routingKeys:@[@"kern.*", @"*.critical"]];
16+
sleep(2);
17+
[self emitLogTopic:conn message:@"Hello World!" routingKey:@"kern.info"];
18+
[self emitLogTopic:conn message:@"A critical kernel error" routingKey:@"kern.critical"];
19+
[self emitLogTopic:conn message:@"Critical module error" routingKey:@"somemod.critical"];
20+
[self emitLogTopic:conn message:@"Just some module info. You won't get this." routingKey:@"somemod.info"];
21+
}
22+
23+
- (void)receiveLogsTopic:(RMQConnection *)conn routingKeys:(NSArray *)routingKeys {
2524
id<RMQChannel> ch = [conn createChannel];
2625
RMQExchange *x = [ch topic:@"topic_logs"];
2726
RMQQueue *q = [ch queue:@"" options:RMQQueueDeclareExclusive];
@@ -32,22 +31,17 @@ - (void)receiveLogsTopic:(NSArray *)routingKeys {
3231

3332
NSLog(@"Waiting for logs.");
3433

35-
[q subscribe:^(RMQDeliveryInfo * _Nonnull deliveryInfo, RMQMessage * _Nonnull message) {
36-
NSLog(@"%@:%@", deliveryInfo.routingKey, message.content);
34+
[q subscribe:^(RMQMessage * _Nonnull message) {
35+
NSLog(@"%@:%@", message.routingKey, message.content);
3736
}];
3837
}
3938

40-
- (void)emitLogTopic:(NSString *)msg routingKey:(NSString *)routingKey {
41-
RMQConnection *conn = [[RMQConnection alloc] initWithDelegate:[RMQConnectionDelegateLogger new]];
42-
[conn start];
43-
39+
- (void)emitLogTopic:(RMQConnection *)conn message:(NSString *)msg routingKey:(NSString *)routingKey {
4440
id<RMQChannel> ch = [conn createChannel];
4541
RMQExchange *x = [ch topic:@"topic_logs"];
4642

4743
[x publish:msg routingKey:routingKey];
4844
NSLog(@"Sent '%@'", msg);
49-
50-
[conn close];
5145
}
5246

5347
@end

0 commit comments

Comments
 (0)
0