Skip to content

Commit 69cece3

Browse files
fixed #240
1 parent 2807bca commit 69cece3

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

src/main/java/org/woehlke/twitterwall/ScheduledTasks.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,16 @@ public void fetchFollower(){
4242
}
4343
}
4444

45+
@Scheduled(initialDelay= TEN_SECONDS *4, fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_FRIENDS)
46+
public void fetchFriends(){
47+
String msg = "fetch Friends ";
48+
if(schedulerProperties.getFetchFriendsAllow() && !schedulerProperties.getSkipFortesting()) {
49+
Task task = asyncStartTask.fetchFriends();
50+
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
51+
}
52+
}
4553

46-
@Scheduled(initialDelay= TEN_SECONDS *4, fixedRate = FIXED_RATE_FOR_SCHEDULAR_REMOVE_OLD_DATA_FROM_STORAGE)
54+
@Scheduled(initialDelay= TEN_SECONDS *5, fixedRate = FIXED_RATE_FOR_SCHEDULAR_REMOVE_OLD_DATA_FROM_STORAGE)
4755
public void removeOldDataFromStorage(){
4856
String msg = "remove Old Data From Storage: ";
4957
if(schedulerProperties.getRemoveOldDataFromStorageAllow() && !schedulerProperties.getSkipFortesting()) {
@@ -52,7 +60,7 @@ public void removeOldDataFromStorage(){
5260
}
5361
}
5462

55-
@Scheduled(initialDelay= TEN_SECONDS *5, fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER_BY_MENTION)
63+
@Scheduled(initialDelay= TEN_SECONDS *6, fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER_BY_MENTION)
5664
public void updateUserProfilesFromMentions(){
5765
String msg = "update User Profiles From Mentions";
5866
if(schedulerProperties.getAllowUpdateUserProfilesFromMention() && !schedulerProperties.getSkipFortesting()) {
@@ -61,7 +69,7 @@ public void updateUserProfilesFromMentions(){
6169
}
6270
}
6371

64-
@Scheduled(initialDelay= TEN_SECONDS *6, fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_TWEETS)
72+
@Scheduled(initialDelay= TEN_SECONDS *7, fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_TWEETS)
6573
public void updateTweets() {
6674
String msg = "update Tweets ";
6775
if(schedulerProperties.getAllowUpdateTweets() && !schedulerProperties.getSkipFortesting()){
@@ -70,7 +78,7 @@ public void updateTweets() {
7078
}
7179
}
7280

73-
@Scheduled(initialDelay= TEN_SECONDS *7, fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER)
81+
@Scheduled(initialDelay= TEN_SECONDS *8, fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER)
7482
public void updateUserProfiles() {
7583
String msg = "update User Profiles ";
7684
if(schedulerProperties.getAllowUpdateUserProfiles() && !schedulerProperties.getSkipFortesting()) {
@@ -79,15 +87,6 @@ public void updateUserProfiles() {
7987
}
8088
}
8189

82-
@Scheduled(initialDelay= TEN_SECONDS *8, fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_FRIENDS)
83-
public void fetchFriends(){
84-
String msg = "fetch Friends ";
85-
if(schedulerProperties.getFetchFriendsAllow() && !schedulerProperties.getSkipFortesting()) {
86-
Task task = asyncStartTask.fetchFriends();
87-
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
88-
}
89-
}
90-
9190
@Autowired
9291
public ScheduledTasks(SchedulerProperties schedulerProperties, AsyncStartTask mqAsyncStartTask) {
9392
this.schedulerProperties = schedulerProperties;

src/main/java/org/woehlke/twitterwall/oodm/service/impl/DomainServiceWithTaskImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public T store(T domainObject, Task task) {
6060
} else {
6161
domainObjectPersistent = null;
6262
log.error(msg+"Something strange happened!");
63-
log.debug(msg+"tried to persist: " + domainObject.toString());
64-
log.debug(msg+"found: " + domainObjectPersistent.toString());
63+
log.debug(msg+"tried to persist: " + domainObject.getUniqueId());
64+
log.debug(msg+"found: " + domainObjectPersistent.getUniqueId());
6565
}
6666
}
6767
}
@@ -79,13 +79,13 @@ public T store(T domainObject, Task task) {
7979
} else {
8080
domainObject.setCreatedBy(task);
8181
domainObject.setUpdatedBy(task);
82-
log.debug("try to persist: " + domainObject.toString());
82+
log.debug("try to persist: " + domainObject.getUniqueId());
8383
storedObject = domainRepository.save(domainObject);
8484
domainObjectResult = storedObject;
85-
log.debug("persisted: " + domainObjectResult.toString());
85+
log.debug("persisted: " + domainObjectResult.getUniqueId());
8686
}
8787
} catch (Exception e) {
88-
log.warn(msg,e.getMessage());
88+
log.warn(msg+domainObject.toString(),e);
8989
}
9090
return domainObjectResult;
9191
}

0 commit comments

Comments
 (0)