Skip to content

Commit e7fb8d0

Browse files
tenebaultenebaul
authored
Merge pull request #7 from downgoon/develop
feat #6 planning to decouple mem-dns and mem-boss
2 parents 1a1e68c + 1c345d1 commit e7fb8d0

File tree

5 files changed

+90
-81
lines changed

5 files changed

+90
-81
lines changed

‎memcloud-alert/pom.xml

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,21 @@
1515
<app.simple.name>memalert</app.simple.name>
1616
<build.number>${maven.build.timestamp}</build.number>
1717
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
18+
<xmemcached.version>1.3.6</xmemcached.version>
1819
</properties>
1920

2021
<dependencies>
2122

23+
<dependency>
24+
<groupId>io.memcloud</groupId>
25+
<artifactId>memcloud-data-mongodb</artifactId>
26+
<version>0.2.0</version>
27+
</dependency>
28+
29+
<!--
30+
https://github.com/downgoon/memcloud/issues/6
31+
a better way is RPC/REST, not direct dao
32+
-->
2233
<dependency>
2334
<groupId>io.memcloud</groupId>
2435
<artifactId>memcloud-data-dao</artifactId>
@@ -30,26 +41,29 @@
3041
</exclusion>
3142
</exclusions>
3243
</dependency>
33-
44+
3445
<dependency>
35-
<groupId>io.memcloud</groupId>
36-
<artifactId>memcloud-data-mongodb</artifactId>
37-
<version>0.2.0</version>
46+
<groupId>com.googlecode.xmemcached</groupId>
47+
<artifactId>xmemcached</artifactId>
48+
<version>${xmemcached.version}</version>
3849
<exclusions>
3950
<exclusion>
40-
<artifactId>memcloud-data-model</artifactId>
41-
<groupId>io.memcloud</groupId>
51+
<artifactId>slf4j-api</artifactId>
52+
<groupId>org.slf4j</groupId>
53+
</exclusion>
54+
<exclusion>
55+
<artifactId>slf4j-log4j12</artifactId>
56+
<groupId>org.slf4j</groupId>
57+
</exclusion>
58+
<exclusion>
59+
<artifactId>log4j</artifactId>
60+
<groupId>log4j</groupId>
4261
</exclusion>
4362
</exclusions>
4463
</dependency>
45-
46-
47-
<dependency>
48-
<groupId>io.memcloud</groupId>
49-
<artifactId>memcloud-data-model</artifactId>
50-
<version>0.2.0</version>
51-
</dependency>
52-
64+
65+
66+
5367

5468
<dependency>
5569
<groupId>org.apache.commons</groupId>

‎memcloud-alert/src/test/java/io/memcloud/stats/business/TestMemInstanceFaultManager.java

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
//package io.memcloud.stats.business;
2+
//
3+
//import org.junit.Before;
4+
//import org.junit.Test;
5+
//import org.springframework.context.ApplicationContext;
6+
//import org.springframework.context.support.ClassPathXmlApplicationContext;
7+
//
8+
//
9+
//public class TestMemInstanceFaultManager {
10+
//
11+
// private IMemInstanceFaultManager memInstanceFaultManager;
12+
//
13+
// @Before
14+
// public void setUp() throws Exception {
15+
// ApplicationContext factory = new ClassPathXmlApplicationContext("classpath:applicationContext.xml");
16+
// memInstanceFaultManager = (IMemInstanceFaultManager)factory.getBean("memInstanceFaultManager");
17+
//
18+
// }
19+
//
20+
// @Test
21+
// public void test(){
22+
// for(int i=0;i<6;i++){
23+
// memInstanceFaultManager.sendFaultMessage("10.10.83.180", 18602);
24+
// try {
25+
// Thread.sleep(10000);
26+
// } catch (InterruptedException e) {
27+
// e.printStackTrace();
28+
// }
29+
// }
30+
//
31+
// for(int i=0;i<28;i++){
32+
// memInstanceFaultManager.sendFaultMessage("10.10.83.180", 18602);
33+
// try {
34+
// Thread.sleep(10000);
35+
// } catch (InterruptedException e) {
36+
// e.printStackTrace();
37+
// }
38+
// }
39+
// }
40+
//}

‎memcloud-dns/src/test/java/io/memcloud/stats/dao/impl/MemStatDaoImplDemo.java renamed to ‎memcloud-data-mongodb/src/test/java/io/memcloud/stats/dao/impl/MemStatDaoImplDemo.java

File renamed without changes.

‎memcloud-dns/pom.xml

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,49 +21,44 @@
2121

2222
<dependencies>
2323

24+
<!--
25+
play as the mem-dns role which only depends on 'memcloud-data-dao' and MySQL
26+
-->
27+
2428
<dependency>
2529
<groupId>io.memcloud</groupId>
26-
<artifactId>memcloud-alert</artifactId>
27-
<version>0.2.0</version>
28-
</dependency>
29-
30-
<dependency>
31-
<groupId>io.memcloud</groupId>
32-
<artifactId>memcloud-cas</artifactId>
30+
<artifactId>memcloud-data-dao</artifactId>
3331
<version>0.2.0</version>
3432
</dependency>
35-
33+
34+
35+
<!--
36+
play as the mem-boss role which depends on
37+
- [1] mem-dns: Memcached Pool and allocated mem-agent for Apps
38+
- [2] mem-alert: Memcached Stats Data stored in MongoDB
39+
- [3] mem-cas: User Login
40+
-->
41+
42+
<!--
3643
<dependency>
3744
<groupId>io.memcloud</groupId>
38-
<artifactId>memcloud-data-dao</artifactId>
45+
<artifactId>memcloud-dns</artifactId>
3946
<version>0.2.0</version>
40-
<exclusions>
41-
<exclusion>
42-
<artifactId>memcloud-data-model</artifactId>
43-
<groupId>io.memcloud</groupId>
44-
</exclusion>
45-
</exclusions>
4647
</dependency>
47-
48+
-->
49+
4850
<dependency>
4951
<groupId>io.memcloud</groupId>
50-
<artifactId>memcloud-data-mongodb</artifactId>
52+
<artifactId>memcloud-alert</artifactId>
5153
<version>0.2.0</version>
52-
<exclusions>
53-
<exclusion>
54-
<artifactId>memcloud-data-model</artifactId>
55-
<groupId>io.memcloud</groupId>
56-
</exclusion>
57-
</exclusions>
5854
</dependency>
59-
60-
55+
6156
<dependency>
6257
<groupId>io.memcloud</groupId>
63-
<artifactId>memcloud-data-model</artifactId>
58+
<artifactId>memcloud-cas</artifactId>
6459
<version>0.2.0</version>
6560
</dependency>
66-
61+
6762
<dependency>
6863
<groupId>org.springframework</groupId>
6964
<artifactId>spring-web</artifactId>

‎memcloud-dns/src/test/java/io/memcloud/stats/business/TestMemInstanceFaultManager.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)