Browse Source

Translate log info to english

Andrea Fazzi 5 years ago
parent
commit
620e41ad78
2 changed files with 26 additions and 30 deletions
  1. 25 25
      cron/sync/sync.go
  2. 1 5
      main.go

+ 25 - 25
cron/sync/sync.go

@@ -109,7 +109,7 @@ func (syncJob *SyncJob) sendMail(teacher *orm.Teacher, tpl *template.Template) e
 			return err
 			return err
 		}
 		}
 	} else {
 	} else {
-		log.Printf("Invierei le credenziali a %s, la nuova password è %s", teacher.AltEmail, teacher.PlainPassword)
+		log.Printf("Credentials would be sent to %s, new password is %s", teacher.AltEmail, teacher.PlainPassword)
 	}
 	}
 
 
 	return nil
 	return nil
@@ -151,7 +151,7 @@ func (syncJob *SyncJob) syncTeachers(ldapClient *karmen_ldap.Client, karmenClien
 	// Add
 	// Add
 
 
 	if !syncJob.conf.Sync.SafeRun {
 	if !syncJob.conf.Sync.SafeRun {
-		log.Printf("Aggiungo %d utenze", len(toBeAdded))
+		log.Printf("ADDING %d users", len(toBeAdded))
 		for _, teacher := range toBeAdded {
 		for _, teacher := range toBeAdded {
 			password, err := password.Generate(8, 2, 0, false, true)
 			password, err := password.Generate(8, 2, 0, false, true)
 			if err != nil {
 			if err != nil {
@@ -165,7 +165,7 @@ func (syncJob *SyncJob) syncTeachers(ldapClient *karmen_ldap.Client, karmenClien
 				return err
 				return err
 			}
 			}
 
 
-			log.Printf("Ho aggiunto il docente %s", teacher.CompleteName())
+			log.Printf("ADD teacher %s", teacher.CompleteName())
 
 
 			if teacher.Regenerate {
 			if teacher.Regenerate {
 				err = syncJob.sendMail(teacher, mailTpl)
 				err = syncJob.sendMail(teacher, mailTpl)
@@ -185,9 +185,9 @@ func (syncJob *SyncJob) syncTeachers(ldapClient *karmen_ldap.Client, karmenClien
 		}
 		}
 	} else {
 	} else {
 		if len(toBeAdded) == 0 {
 		if len(toBeAdded) == 0 {
-			log.Println("Non verranno aggiunte utenze")
+			log.Println("No users WOULD BE added.")
 		} else {
 		} else {
-			log.Printf("Verranno aggiunte %d utenze", len(toBeAdded))
+			log.Printf("%d users WOULD BE added...", len(toBeAdded))
 			for _, teacher := range toBeAdded {
 			for _, teacher := range toBeAdded {
 				log.Println(teacher.CompleteName())
 				log.Println(teacher.CompleteName())
 				if teacher.Regenerate {
 				if teacher.Regenerate {
@@ -210,16 +210,16 @@ func (syncJob *SyncJob) syncTeachers(ldapClient *karmen_ldap.Client, karmenClien
 	// Remove
 	// Remove
 
 
 	if !syncJob.conf.Sync.SafeRun {
 	if !syncJob.conf.Sync.SafeRun {
-		log.Printf("Rimuovo %d utenze", len(toBeRemoved))
+		log.Printf("%d will be REMOVED...", len(toBeRemoved))
 		for _, entry := range toBeRemoved {
 		for _, entry := range toBeRemoved {
 			err := ldapClient.DeleteByDN(entry)
 			err := ldapClient.DeleteByDN(entry)
 			if err != nil {
 			if err != nil {
 				return err
 				return err
 			}
 			}
-			log.Printf("Rimuovo %s", entry)
+			log.Printf("REMOVE %s", entry)
 		}
 		}
 	} else {
 	} else {
-		log.Printf("Verranno rimosse %d utenze", len(toBeRemoved))
+		log.Printf("%d users WOULD BE removed", len(toBeRemoved))
 		for _, entry := range toBeRemoved {
 		for _, entry := range toBeRemoved {
 			log.Println(entry)
 			log.Println(entry)
 		}
 		}
@@ -228,7 +228,7 @@ func (syncJob *SyncJob) syncTeachers(ldapClient *karmen_ldap.Client, karmenClien
 	// Update
 	// Update
 
 
 	if !syncJob.conf.Sync.SafeRun {
 	if !syncJob.conf.Sync.SafeRun {
-		log.Printf("Aggiorno %d utenze", len(toBeUpdated))
+		log.Printf("UPDATING %d users", len(toBeUpdated))
 		for _, teacher := range toBeUpdated {
 		for _, teacher := range toBeUpdated {
 			if teacher.Regenerate {
 			if teacher.Regenerate {
 				password, err := password.Generate(8, 2, 0, false, true)
 				password, err := password.Generate(8, 2, 0, false, true)
@@ -257,7 +257,7 @@ func (syncJob *SyncJob) syncTeachers(ldapClient *karmen_ldap.Client, karmenClien
 		}
 		}
 
 
 	} else {
 	} else {
-		log.Printf("Verranno aggiornate %d utenze", len(toBeUpdated))
+		log.Printf("%d users WOULD BE updated...", len(toBeUpdated))
 		for _, teacher := range toBeUpdated {
 		for _, teacher := range toBeUpdated {
 			log.Println(teacher.CompleteName())
 			log.Println(teacher.CompleteName())
 		}
 		}
@@ -299,7 +299,7 @@ func (syncJob *SyncJob) syncGroup(ldapClient *karmen_ldap.Client, groupDN string
 	}
 	}
 
 
 	if !syncJob.conf.Sync.SafeRun {
 	if !syncJob.conf.Sync.SafeRun {
-		log.Printf("Aggiungo %d docenti al gruppo %s", len(toBeAdded), groupDN)
+		log.Printf("ADDING %d teachers to %s group", len(toBeAdded), groupDN)
 		for _, teacher := range toBeAdded {
 		for _, teacher := range toBeAdded {
 			log.Println(teacher.CompleteName())
 			log.Println(teacher.CompleteName())
 			err = ldapClient.AddTeacherToGroup(teacher, groupDN)
 			err = ldapClient.AddTeacherToGroup(teacher, groupDN)
@@ -309,9 +309,9 @@ func (syncJob *SyncJob) syncGroup(ldapClient *karmen_ldap.Client, groupDN string
 		}
 		}
 	} else {
 	} else {
 		if len(toBeAdded) == 0 {
 		if len(toBeAdded) == 0 {
-			log.Printf("Non verranno aggiunti docenti al gruppo %s", groupDN)
+			log.Printf("No users WOULD BE ADDED to %s group", groupDN)
 		} else {
 		} else {
-			log.Printf("Verranno aggiunti %d docenti al gruppo %s", len(toBeAdded), groupDN)
+			log.Printf("%d users WOULD BE ADDED to %s group", len(toBeAdded), groupDN)
 			for _, teacher := range toBeAdded {
 			for _, teacher := range toBeAdded {
 				log.Println(teacher.CompleteName())
 				log.Println(teacher.CompleteName())
 			}
 			}
@@ -319,13 +319,13 @@ func (syncJob *SyncJob) syncGroup(ldapClient *karmen_ldap.Client, groupDN string
 	}
 	}
 
 
 	if !syncJob.conf.Sync.SafeRun {
 	if !syncJob.conf.Sync.SafeRun {
-		log.Printf("Rimuovo %d docenti dal gruppo %s", len(toBeRemoved), groupDN)
+		log.Printf("REMOVING %d users from %s group...", len(toBeRemoved), groupDN)
 		for _, value := range toBeRemoved {
 		for _, value := range toBeRemoved {
-			log.Printf("RIMUOVO il docente %s dal gruppo %s", value, groupDN)
+			log.Printf("REMOVE %s from %s group.", value, groupDN)
 			ldapClient.RemoveTeacherFromGroupByMemberValue(value, groupDN)
 			ldapClient.RemoveTeacherFromGroupByMemberValue(value, groupDN)
 		}
 		}
 	} else {
 	} else {
-		log.Printf("Verranno rimossi %d docenti dal gruppo %s", len(toBeRemoved), groupDN)
+		log.Printf("%d users WOULD BE REMOVED FROM %s group", len(toBeRemoved), groupDN)
 		for _, entry := range toBeRemoved {
 		for _, entry := range toBeRemoved {
 			log.Println(entry)
 			log.Println(entry)
 		}
 		}
@@ -336,10 +336,10 @@ func (syncJob *SyncJob) syncGroup(ldapClient *karmen_ldap.Client, groupDN string
 
 
 func (syncJob *SyncJob) Run() {
 func (syncJob *SyncJob) Run() {
 	if syncJob.conf.Sync.SafeRun {
 	if syncJob.conf.Sync.SafeRun {
-		log.Println("Sto girando in modalità SICURA!")
+		log.Println("Running in SAFE MODE...")
 	}
 	}
 
 
-	log.Printf("Mi connetto a karmen %s...", syncJob.conf.Url)
+	log.Printf("Connecting to karmen at %s...", syncJob.conf.Url)
 	karmenClient, err := karmen_client.Dial(syncJob.conf.Url, syncJob.conf.Admin.Username, syncJob.conf.Admin.Password)
 	karmenClient, err := karmen_client.Dial(syncJob.conf.Url, syncJob.conf.Admin.Username, syncJob.conf.Admin.Password)
 	if err != nil {
 	if err != nil {
 		log.Println(err)
 		log.Println(err)
@@ -350,40 +350,40 @@ func (syncJob *SyncJob) Run() {
 		log.Println(err)
 		log.Println(err)
 	}
 	}
 
 
-	log.Printf("Mi connetto alla directory LDAP %s...", syncJob.conf.Ldap.Host)
+	log.Printf("Connecting to LDAP at %s...", syncJob.conf.Ldap.Host)
 	ldapClient, err := karmen_ldap.NewClient(syncJob.conf.Ldap.Host, syncJob.conf)
 	ldapClient, err := karmen_ldap.NewClient(syncJob.conf.Ldap.Host, syncJob.conf)
 	if err != nil {
 	if err != nil {
 		log.Println(err)
 		log.Println(err)
 	}
 	}
 
 
-	log.Println("Recupero i docenti su LDAP...")
+	log.Println("Retrieving teachers from LDAP...")
 	entries, err := ldapClient.Teachers()
 	entries, err := ldapClient.Teachers()
 	if err != nil {
 	if err != nil {
 		log.Println(err)
 		log.Println(err)
 	}
 	}
 
 
-	log.Println("Recupero i dipartimenti...")
+	log.Println("Retrieving Departments...")
 	departments, err := karmenClient.GetDepartments()
 	departments, err := karmenClient.GetDepartments()
 	if err != nil {
 	if err != nil {
 		log.Println(err)
 		log.Println(err)
 	}
 	}
 
 
-	log.Println("Sincronizzo i docenti su LDAP...")
+	log.Println("Sync teachers...")
 	if err := syncJob.syncTeachers(ldapClient, karmenClient, entries, teachers); err != nil {
 	if err := syncJob.syncTeachers(ldapClient, karmenClient, entries, teachers); err != nil {
 		panic(err)
 		panic(err)
 	}
 	}
 
 
-	log.Println("Sincronizzo il gruppo 'Docenti'...")
+	log.Println("Sync 'Docenti' group...")
 	if err := syncJob.syncGroup(ldapClient, "cn=Docenti", teachers); err != nil {
 	if err := syncJob.syncGroup(ldapClient, "cn=Docenti", teachers); err != nil {
 		panic(err)
 		panic(err)
 	}
 	}
 
 
-	log.Println("Sincronizzo la ML 'Tutti i docenti'...")
+	log.Println("Sync 'Tutti i docenti' ML...")
 	if err := syncJob.syncGroup(ldapClient, "cn=Tutti i docenti,ou=Mailing Lists", teachers); err != nil {
 	if err := syncJob.syncGroup(ldapClient, "cn=Tutti i docenti,ou=Mailing Lists", teachers); err != nil {
 		panic(err)
 		panic(err)
 	}
 	}
 
 
-	log.Println("Sincronizzo gruppi e ML dei dipartimenti su LDAP...")
+	log.Println("Sync Departments and MLs...")
 	for _, department := range departments {
 	for _, department := range departments {
 		group := fmt.Sprintf("cn=%s,ou=Mailing Lists", department.Name)
 		group := fmt.Sprintf("cn=%s,ou=Mailing Lists", department.Name)
 		err = syncJob.syncGroup(ldapClient, group, department.Teachers)
 		err = syncJob.syncGroup(ldapClient, group, department.Teachers)

+ 1 - 5
main.go

@@ -65,14 +65,10 @@ func main() {
 
 
 	syncJob := sync.NewSyncJob(config.Config)
 	syncJob := sync.NewSyncJob(config.Config)
 
 
-	c.AddJob("@every 1m", syncJob)
+	c.AddJob("@every 10m", syncJob)
 
 
 	c.Start()
 	c.Start()
 
 
-	for _, entry := range c.Entries() {
-		log.Println(entry)
-	}
-
 	log.Println("karmen is listening to port 3000...")
 	log.Println("karmen is listening to port 3000...")
 	if err := http.ListenAndServe(":3000", handlers.LoggingHandler(os.Stdout, karmen_handlers.Handlers())); err != nil {
 	if err := http.ListenAndServe(":3000", handlers.LoggingHandler(os.Stdout, karmen_handlers.Handlers())); err != nil {
 		panic(err)
 		panic(err)