Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone in…

…to trunk
UniversityOfHelsinkiCS · May 24, 2019 · 9604fdf · 9604fdf
2 parents b8cb6f7 + bcd2053
commit 9604fdf
Show file tree

Hide file tree

Showing 6 changed files with 192 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,5 @@ services/updater_scheduler/all_student_numbers.txt
 services/updater_scheduler/debug.log
 services/updater_scheduler/active_student_numbers.txt
 services/oodikone2-backend/debug.log
-datastore
+datastore
+services/updater_api/debug.log
diff --git a/services/backend/updater_writer/updater/database_updater.js b/services/backend/updater_writer/updater/database_updater.js
@@ -38,7 +38,7 @@ const updateAttainments = (studyAttainments, transaction) => studyAttainments.ma
       creditTeachers.length > 0 && Promise.all(creditTeachers.map(cT => CreditTeacher.upsert(cT, { transaction })))
     ])
   } catch (e) {
-    console.log(e)
+    console.log('attainment update failed', e)
   }
 })
 
@@ -61,12 +61,9 @@ const updateStudent = async (student) => {
     await deleteStudentStudyrights(studentInfo.studentnumber, transaction) // this needs to be done because Oodi just deletes deprecated studyrights from students ( big yikes )
 
     await Student.upsert(studentInfo, { transaction })
-    try {
     await Promise.all(semesterEnrollments.map(SE =>
       SemesterEnrollment.upsert(SE, { transaction })))
-    } catch(e) {
-      console.log(e)
-    }
+
     if (studyAttainments) await Promise.all(updateAttainments(studyAttainments, transaction))
 
     if (studyRights) await Promise.all(updateStudyRights(studyRights, transaction))

diff --git a/services/updater_api/doo_api_database_updater/oodi_interface.js b/services/updater_api/doo_api_database_updater/oodi_interface.js
@@ -36,7 +36,7 @@ const attemptGetFor = async (url, attempts = 5) => {
     attempt += 1
     try {
       response = await getUrl(url)
-      logger.info('requested url', { url, status: response.status })
+      logger.info('requested url', { url, success: response.status === 200 })
       return response
     } catch (error) {
       if (attempt === attempts) {
@@ -63,7 +63,7 @@ console.log(process.env.NODE_ENV)
 const getStudent = async studentNumber => {
   const url = `${base_url}/students/${studentNumber}/info`
   try {
-    const response = await getUrl(url)
+    const response = await attemptGetFor(url)
     const data = response.data.data
     return data
   } catch (e) {

diff --git a/services/updater_api/logger.js b/services/updater_api/logger.js
@@ -16,8 +16,6 @@ if (process.env.NODE_ENV !== 'test') {
   transports.push(new winston.transports.File({ filename: 'debug.log' }))
 }
 
-transports.push(new winston.transports.Console({ level: 'debug' }))
-
 
 const logger = winston.createLogger({ transports })
 

diff --git a/services/updater_api/package-lock.json b/services/updater_api/package-lock.json
diff --git a/services/updater_api/package.json b/services/updater_api/package.json
@@ -16,6 +16,8 @@
     "lodash": "^4.17.11",
     "moment": "^2.24.0",
     "node-nats-streaming": "^0.2.2",
-    "nodemon": "^1.18.10"
+    "nodemon": "^1.18.10",
+    "winston": "^3.2.1",
+    "winston-log2gelf": "^2.0.4"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,8 +16,6 @@ if (process.env.NODE_ENV !== 'test') { @@
       transports.push(new winston.transports.File({ filename: 'debug.log' }))
     }
-    transports.push(new winston.transports.Console({ level: 'debug' }))
     const logger = winston.createLogger({ transports })
@@ Expand Down @@