backend/satellite_tools/reposync.py | 4
-
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 3
-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 8
++
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 27
++++++----
4 files changed, 28 insertions(+), 14 deletions(-)
New commits:
commit cb96846c44dd4a9edb6bebf809043f4b38206d6f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 30 18:11:31 2009 -0400
some repo sync task fixes
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index 4160ba1..1002d2f 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -145,7 +145,8 @@ public class ConfigDefaults {
public static final String VIRT_DISK = "kickstart.virt_disk_size_gb";
public static final String KICKSTART_NETWORK_INTERFACE =
"kickstart.default_interface";
- public static final String SPACEWALK_REPO_SYNC_PATH =
"spacewalk_repo_sync_path";
+ public static final String SPACEWALK_REPOSYNC_PATH =
"spacewalk_reposync_path";
+ public static final String SPACEWALK_REPOSYNC_LOG_FILE =
"spacewalk_reposync_logfile";
private ConfigDefaults() {
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 6f913d1..ba3ae7d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -335,7 +335,9 @@ public class EditChannelAction extends RhnAction implements Listable
{
ucc.setAccess((String)form.get("org_sharing"));
ucc.setYumUrl((String) form.getString("yum_repo"));
ucc.setRepoLabel((String) form.getString("repo_label"));
- ucc.setSyncRepo((Boolean)form.get("sync_repo"));
+ if (form.get("sync_repo") != null) {
+ ucc.setSyncRepo((Boolean)form.get("sync_repo"));
+ }
String parent = (String)form.get("parent");
if (parent == null || parent.equals("")) {
@@ -408,7 +410,9 @@ public class EditChannelAction extends RhnAction implements Listable
{
ccc.setAccess((String)form.get("org_sharing"));
ccc.setYumUrl((String) form.getString("yum_repo"));
ccc.setRepoLabel((String) form.getString("repo_label"));
- ccc.setSyncRepo((Boolean)form.get("sync_repo"));
+ if (form.get("sync_repo") != null) {
+ ccc.setSyncRepo((Boolean)form.get("sync_repo"));
+ }
String parent = (String)form.get("parent");
if (parent == null || parent.equals("")) {
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index 98c3272..40a4c2c 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -95,18 +95,19 @@ public class RepoSyncTask implements Job {
private static List<String> getSyncCommand(ContentSource src) {
List<String> cmd = new ArrayList<String>();
- cmd.add(Config.get().getString(ConfigDefaults.SPACEWALK_REPO_SYNC_PATH,
+ cmd.add(Config.get().getString(ConfigDefaults.SPACEWALK_REPOSYNC_PATH,
"/usr/bin/spacewalk-repo-sync"));
- cmd.add("-c");
+ cmd.add("--channel");
cmd.add(src.getChannel().getLabel());
- cmd.add("-u");
+ cmd.add("--url");
cmd.add(src.getSourceUrl());
- cmd.add("-t");
+ cmd.add("--type");
cmd.add(src.getType().getLabel());
- cmd.add("-l");
+ cmd.add("--label");
cmd.add(src.getLabel());
- cmd.add("-g");
- cmd.add("/var/log/rhn/rhn_reposync.log");
+ cmd.add("--logfile");
+ cmd.add(Config.get().getString(ConfigDefaults.SPACEWALK_REPOSYNC_LOG_FILE,
+ "/var/log/rhn/rhn_reposync.log"));
return cmd;
}
commit 0c0b1227c5e534232f49d435ff7e8f7f0b0c1938
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 30 17:39:06 2009 -0400
updating task to include log file and more logging
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index fdbe9e4..98c3272 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -27,6 +27,7 @@ import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -63,23 +64,28 @@ public class RepoSyncTask implements Job {
throws JobExecutionException {
for (Task task : TaskFactory.listTasks(DISPLAY_NAME)) {
-
ContentSource src = ChannelFactory.lookupContentSource(task.getData());
+ if (log.isInfoEnabled()) {
+ log.info("Syncing repo " + src.getSourceUrl() + " to
channel "
+ + src.getChannel().getLabel());
+ }
if (src == null) {
log.error("Content Source could not be found: " +
task.getData());
continue;
}
try {
-
Process p = Runtime.getRuntime().exec(
- (String[]) getSyncCommand(src).toArray());
+ getSyncCommand(src).toArray(new String[0]));
p.waitFor();
+
}
catch (IOException e) {
+ log.fatal(e.getMessage());
e.printStackTrace();
}
catch (InterruptedException e) {
+ log.fatal(e.getMessage());
e.printStackTrace();
}
src.setLastSynced(new Date());
@@ -90,7 +96,7 @@ public class RepoSyncTask implements Job {
private static List<String> getSyncCommand(ContentSource src) {
List<String> cmd = new ArrayList<String>();
cmd.add(Config.get().getString(ConfigDefaults.SPACEWALK_REPO_SYNC_PATH,
- "/usr/sbin/spacewalk-repo-sync"));
+ "/usr/bin/spacewalk-repo-sync"));
cmd.add("-c");
cmd.add(src.getChannel().getLabel());
cmd.add("-u");
@@ -99,6 +105,8 @@ public class RepoSyncTask implements Job {
cmd.add(src.getType().getLabel());
cmd.add("-l");
cmd.add(src.getLabel());
+ cmd.add("-g");
+ cmd.add("/var/log/rhn/rhn_reposync.log");
return cmd;
}
commit 57112cb536f9142d35aa1030b41cb27b34863627
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Jul 30 17:38:38 2009 -0400
making the logging a bit cleaner
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 053a8c4..9418a78 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -203,13 +203,13 @@ class RepoSync:
def print_msg(self, message):
if self.log_file:
- rhnLog.log_debug(0, message)
+ rhnLog.log_clean(0, message)
print message
def error_msg(self, message):
if self.log_file:
- rhnLog.log_debug(0, message)
+ rhnLog.log_clean(0, message)
sys.stderr.write(message)
class ContentPackage:
Show replies by date