Skip to content

Commit 022e80c

Browse files
authored
v1.0 hotfix (#10)
* remove set_prefix calls * fix timezone conversion issue * do not print prefix if no prefix
1 parent 476fddf commit 022e80c

File tree

4 files changed

+5
-30
lines changed

4 files changed

+5
-30
lines changed

lib/autolab/utility.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ double get_timezone_offset() {
2020
std::time(&raw_time_utc);
2121

2222
std::tm *utc = std::gmtime(&raw_time_utc);
23+
utc->tm_isdst = -1;
2324
std::time_t raw_time_local = std::mktime(utc);
2425

2526
double diff_in_seconds = std::difftime(raw_time_utc, raw_time_local);

lib/logger/logger.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ namespace Logger {
5252
fatal_logger &operator<<(T val) {
5353
if (!prefix_used) {
5454
prefix_used = true;
55-
std::cerr << "fatal: " << prefix << std::endl;
55+
std::cerr << "fatal: ";
56+
if (prefix.length() > 0) {
57+
std::cerr << prefix << std::endl;
58+
}
5659
}
5760
std::cerr << val;
5861
return *this;

src/cmd/cmdimp.cpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,6 @@ int show_status(cmdargs &cmd) {
162162
"directory, the details of the assessment will be shown.");
163163
cmd.setup_done();
164164

165-
// set up logger
166-
Logger::fatal.set_prefix("Cannot show status");
167-
168165
std::string course_name, asmt_name;
169166
bool in_asmt_dir = read_asmt_file(course_name, asmt_name);
170167
if (!in_asmt_dir) {
@@ -214,9 +211,6 @@ int download_asmt(cmdargs &cmd) {
214211
cmd.new_arg("course_name:assessment_name", true);
215212
cmd.setup_done();
216213

217-
// set up logger
218-
Logger::fatal.set_prefix("Cannot download assessment");
219-
220214
// parse course and assessment name
221215
std::string course_name, asmt_name;
222216
parse_course_and_asmt(cmd.args[2], course_name, asmt_name);
@@ -300,9 +294,6 @@ int submit_asmt(cmdargs &cmd) {
300294

301295
std::string course_name, asmt_name, filename;
302296

303-
// set up logger
304-
Logger::fatal.set_prefix("Cannot submit assessment");
305-
306297
if (cmd.nargs() >= 4) {
307298
// user provided course and assessment name with filename
308299
parse_course_and_asmt(cmd.args[2], course_name, asmt_name);
@@ -409,9 +400,6 @@ int show_courses(cmdargs &cmd) {
409400
"List all current courses of the user.");
410401
cmd.setup_done();
411402

412-
// set up logger
413-
Logger::fatal.set_prefix("Cannot get courses");
414-
415403
// hidden option --use-cache
416404
if (cmd.has_option("-u", "--use-cache")) {
417405
print_course_cache_entry();
@@ -471,9 +459,6 @@ int manage_enrolls(cmdargs &cmd) {
471459
"enrollment data after new, edit, or delete");
472460
cmd.setup_done();
473461

474-
// set up logger
475-
Logger::fatal.set_prefix("Cannot get enrollments");
476-
477462
std::vector<Autolab::Enrollment> enrollments;
478463
if (cmd.nargs() == 4) {
479464
std::string action(cmd.args[2]);
@@ -573,9 +558,6 @@ int show_assessments(cmdargs &cmd) {
573558
cmd.new_arg("course_name", true);
574559
cmd.setup_done();
575560

576-
// set up logger
577-
Logger::fatal.set_prefix("Cannot get assessments");
578-
579561
std::string course_name(cmd.args[2]);
580562

581563
// hidden option --use-cache
@@ -622,9 +604,6 @@ int show_problems(cmdargs &cmd) {
622604
cmd.new_arg("course_name:assessment_name", false);
623605
cmd.setup_done();
624606

625-
// set up logger
626-
Logger::fatal.set_prefix("Cannot get problems");
627-
628607
std::string course_name, asmt_name;
629608
// user-specified names take precedence
630609
if (cmd.nargs() >= 3) {
@@ -662,9 +641,6 @@ int show_scores(cmdargs &cmd) {
662641
"Show scores from all submission. Default shows only the latest");
663642
cmd.setup_done();
664643

665-
// set up logger
666-
Logger::fatal.set_prefix("Cannot get scores");
667-
668644
std::string course_name, asmt_name;
669645
// user-specified names take precedence
670646
if (cmd.nargs() >= 3) {
@@ -713,9 +689,6 @@ int show_feedback(cmdargs &cmd) {
713689
"Get feedback for this particular version");
714690
cmd.setup_done();
715691

716-
// set up logger
717-
Logger::fatal.set_prefix("Cannot get feedback");
718-
719692
std::string course_name, asmt_name;
720693
// user-specified names take precedence
721694
if (cmd.nargs() >= 3) {

src/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ int main(int argc, char *argv[]) {
133133
if ("setup" == command) {
134134
return user_setup(cmd);
135135
} else {
136-
Logger::fatal.set_prefix("Cannot start autolab client");
137-
138136
if (!init_autolab_client()) {
139137
Logger::fatal << "No user set up on this client yet." << Logger::endl
140138
<< Logger::endl

0 commit comments

Comments
 (0)