Commit 9ef4ff28 authored by Maiken's avatar Maiken
Browse files

Merge branch 'issue_11' into 'master'

Reducing level and number of log messages.

See merge request nordugrid/arc!50
parents 33f6deac 79874e3d
Pipeline #1454 passed with stage
in 60 minutes and 45 seconds
......@@ -229,7 +229,7 @@ TLSSecAttr::TLSSecAttr(PayloadTLSStream& payload, ConfigTLSMCC& config, Logger&
processing_failed_ = true;
logger.msg(ERROR,"VOMS attribute validation failed");
};
logger.msg(ERROR,"VOMS attribute is ignored due to processing/validation error");
logger.msg(WARNING,"VOMS attribute is ignored due to processing/validation error");
v = voms_attributes_.erase(v);
} else {
++v;
......
......@@ -591,7 +591,6 @@ Arc::MCC_Status ARexService::ESNotifyService(ARexGMConfig& config,Arc::XMLNode i
// TODO: Destroy job (at least try to)
} else {
ritem.NewChild("esmanag:Acknowledgement");
logger.msg(Arc::ERROR, "GetActivityStatuses: request attention %s", job.ID());
gm_->RequestJobAttention(job.ID()); // Tell GM to resume this job
};
} else {
......
......@@ -179,7 +179,7 @@ void WakeupInterface::thread() {
// Event arrived
if(!event.empty()) {
// job id provided
logger.msg(Arc::WARNING, "==== External request for attention %s", event);
logger.msg(Arc::DEBUG, "External request for attention %s", event);
jobs_.RequestAttention(event);
} else {
// generic kick
......
......@@ -132,7 +132,6 @@ bool check_file_owner(const std::string &fname,uid_t &uid,gid_t &gid,time_t &t)
bool job_lrms_mark_check(const JobId &id,const GMConfig &config) {
std::string fname = config.ControlDir() + "/job." + id + ".lrms_done";
logger.msg(Arc::ERROR,"Checking lrms mark at %s",fname);
return job_mark_check(fname);
}
......
......@@ -708,7 +708,6 @@ void ARexJob::make_new_job(std::string const& job_desc_str,const std::string& de
deleg_ids.unique();
deleg.LockCred(id_,deleg_ids,config_.GridName());
logger_.msg(Arc::WARNING, "=== New job request for attention: %s", id_);
CommFIFO::Signal(config_.GmConfig().ControlDir(),id_);
return;
}
......@@ -727,7 +726,6 @@ bool ARexJob::Cancel(void) {
if(id_.empty()) return false;
GMJob job(id_,Arc::User(config_.User().get_uid()));
if(!job_cancel_mark_put(job,config_.GmConfig())) return false;
logger_.msg(Arc::WARNING, "=== Cancel job request for attention: %s", id_);
CommFIFO::Signal(config_.GmConfig().ControlDir(),id_);
return true;
}
......@@ -736,7 +734,6 @@ bool ARexJob::Clean(void) {
if(id_.empty()) return false;
GMJob job(id_,Arc::User(config_.User().get_uid()));
if(!job_clean_mark_put(job,config_.GmConfig())) return false;
logger_.msg(Arc::WARNING, "=== Clean job request for attention: %s", id_);
CommFIFO::Signal(config_.GmConfig().ControlDir(),id_);
return true;
}
......@@ -755,7 +752,6 @@ bool ARexJob::Resume(void) {
// Failed to report restart request.
return false;
};
logger_.msg(Arc::WARNING, "=== Resume job request for attention: %s", id_);
CommFIFO::Signal(config_.GmConfig().ControlDir(),id_);
return true;
}
......@@ -1075,7 +1071,6 @@ bool ARexJob::ReportFileComplete(const std::string& filename) {
std::string fname = filename;
if(!normalize_filename(fname)) return false;
if(!job_input_status_add_file(GMJob(id_,Arc::User(config_.User().get_uid())),config_.GmConfig(),"/"+fname)) return false;
logger_.msg(Arc::WARNING, "=== New file request for attention: %s", id_);
CommFIFO::Signal(config_.GmConfig().ControlDir(),id_);
return true;
}
......@@ -1083,7 +1078,6 @@ logger_.msg(Arc::WARNING, "=== New file request for attention: %s", id_);
bool ARexJob::ReportFilesComplete(void) {
if(id_.empty()) return false;
if(!job_input_status_add_file(GMJob(id_,Arc::User(config_.User().get_uid())),config_.GmConfig(),"/")) return false;
logger_.msg(Arc::WARNING, "=== New files request for attention: %s", id_);
CommFIFO::Signal(config_.GmConfig().ControlDir(),id_);
return true;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment