Repository: openmeetings Updated Branches: refs/heads/master 65b178a1c -> f7005ffe3
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f7005ffe Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f7005ffe Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f7005ffe Branch: refs/heads/master Commit: f7005ffe38c6495ada83b63a7b57052b3f28b7eb Parents: 65b178a Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 23:58:50 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 23:58:50 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/cli/Admin.java | 117 ++++++++++--------- .../web/room/sidebar/RoomSidebar.java | 8 +- 2 files changed, 64 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f7005ffe/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index da7f7bc..505d8f8 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -28,6 +28,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplic import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Date; @@ -319,62 +320,8 @@ public class Admin { System.out.println("WARNING: all intermediate files will be clean up!"); } StringBuilder report = new StringBuilder(); - { //UPLOAD - long sectionSize = OmFileHelper.getSize(OmFileHelper.getUploadDir()); - report.append("Upload totally allocates: ").append(OmFileHelper.getHumanSize(sectionSize)).append("\n"); - //Profiles - WebApplicationContext ctx = getApplicationContext(); - UserDao udao = ctx.getBean(UserDao.class); - CleanupEntityUnit profile = CleanupHelper.getProfileUnit(udao); - long restSize = sectionSize - profile.getSizeTotal(); - report.append("\t\tprofiles: ").append(profile.getHumanTotal()).append("\n"); - report.append("\t\t\tinvalid: ").append(profile.getHumanInvalid()).append("\n"); - report.append("\t\t\tdeleted: ").append(profile.getHumanDeleted()).append("\n"); - report.append("\t\t\tmissing count: ").append(profile.getMissing()).append("\n"); - if (cleanup) { - profile.cleanup(); - } - CleanupUnit imp = CleanupHelper.getImportUnit(); - restSize -= imp.getSizeTotal(); - report.append("\t\timport: ").append(OmFileHelper.getHumanSize(imp.getSizeTotal())).append("\n"); - if (cleanup) { - imp.cleanup(); - } - CleanupUnit back = CleanupHelper.getBackupUnit(); - restSize -= back.getSizeTotal(); - report.append("\t\tbackup: ").append(OmFileHelper.getHumanSize(back.getSizeTotal())).append("\n"); - if (cleanup) { - back.cleanup(); - } - //Files - FileItemDao fileDao = ctx.getBean(FileItemDao.class); - CleanupEntityUnit files = CleanupHelper.getFileUnit(fileDao); - restSize -= files.getSizeTotal(); - report.append("\t\tfiles: ").append(files.getHumanTotal()).append("\n"); - report.append("\t\t\tinvalid: ").append(files.getHumanInvalid()).append("\n"); - report.append("\t\t\tdeleted: ").append(files.getHumanDeleted()).append("\n"); - report.append("\t\t\tmissing count: ").append(files.getMissing()).append("\n"); - report.append("\t\trest: ").append(OmFileHelper.getHumanSize(restSize)).append("\n"); - if (cleanup) { - files.cleanup(); - } - } - { //STREAMS - RecordingDao recordDao = getApplicationContext().getBean(RecordingDao.class); - CleanupEntityUnit rec = CleanupHelper.getRecUnit(recordDao); - File hibernateDir = OmFileHelper.getStreamsHibernateDir(); - report.append("Recordings allocates: ").append(rec.getHumanTotal()).append("\n"); - long size = OmFileHelper.getSize(hibernateDir); - long restSize = rec.getSizeTotal() - size; - report.append("\t\tfinal: ").append(OmFileHelper.getHumanSize(size)).append("\n"); - report.append("\t\t\tinvalid: ").append(rec.getHumanInvalid()).append("\n"); - report.append("\t\t\tdeleted: ").append(rec.getHumanDeleted()).append("\n"); - report.append("\t\t\tmissing count: ").append(rec.getMissing()).append("\n"); - report.append("\t\trest: ").append(OmFileHelper.getHumanSize(restSize)).append("\n"); - if (cleanup) { - rec.cleanup(); - } - } + reportUploads(report, cleanup); + reportStreams(report, cleanup); System.out.println(report); } catch (Exception e) { handleError("Files failed", e); @@ -402,6 +349,64 @@ public class Admin { System.exit(0); } + private void reportUploads(StringBuilder report, boolean cleanup) throws IOException { + long sectionSize = OmFileHelper.getSize(OmFileHelper.getUploadDir()); + report.append("Upload totally allocates: ").append(OmFileHelper.getHumanSize(sectionSize)).append("\n"); + //Profiles + WebApplicationContext ctx = getApplicationContext(); + UserDao udao = ctx.getBean(UserDao.class); + CleanupEntityUnit profile = CleanupHelper.getProfileUnit(udao); + long restSize = sectionSize - profile.getSizeTotal(); + report.append("\t\tprofiles: ").append(profile.getHumanTotal()).append("\n"); + report.append("\t\t\tinvalid: ").append(profile.getHumanInvalid()).append("\n"); + report.append("\t\t\tdeleted: ").append(profile.getHumanDeleted()).append("\n"); + report.append("\t\t\tmissing count: ").append(profile.getMissing()).append("\n"); + if (cleanup) { + profile.cleanup(); + } + CleanupUnit imp = CleanupHelper.getImportUnit(); + restSize -= imp.getSizeTotal(); + report.append("\t\timport: ").append(OmFileHelper.getHumanSize(imp.getSizeTotal())).append("\n"); + if (cleanup) { + imp.cleanup(); + } + CleanupUnit back = CleanupHelper.getBackupUnit(); + restSize -= back.getSizeTotal(); + report.append("\t\tbackup: ").append(OmFileHelper.getHumanSize(back.getSizeTotal())).append("\n"); + if (cleanup) { + back.cleanup(); + } + //Files + FileItemDao fileDao = ctx.getBean(FileItemDao.class); + CleanupEntityUnit files = CleanupHelper.getFileUnit(fileDao); + restSize -= files.getSizeTotal(); + report.append("\t\tfiles: ").append(files.getHumanTotal()).append("\n"); + report.append("\t\t\tinvalid: ").append(files.getHumanInvalid()).append("\n"); + report.append("\t\t\tdeleted: ").append(files.getHumanDeleted()).append("\n"); + report.append("\t\t\tmissing count: ").append(files.getMissing()).append("\n"); + report.append("\t\trest: ").append(OmFileHelper.getHumanSize(restSize)).append("\n"); + if (cleanup) { + files.cleanup(); + } + } + + private void reportStreams(StringBuilder report, boolean cleanup) throws IOException { + RecordingDao recordDao = getApplicationContext().getBean(RecordingDao.class); + CleanupEntityUnit rec = CleanupHelper.getRecUnit(recordDao); + File hibernateDir = OmFileHelper.getStreamsHibernateDir(); + report.append("Recordings allocates: ").append(rec.getHumanTotal()).append("\n"); + long size = OmFileHelper.getSize(hibernateDir); + long restSize = rec.getSizeTotal() - size; + report.append("\t\tfinal: ").append(OmFileHelper.getHumanSize(size)).append("\n"); + report.append("\t\t\tinvalid: ").append(rec.getHumanInvalid()).append("\n"); + report.append("\t\t\tdeleted: ").append(rec.getHumanDeleted()).append("\n"); + report.append("\t\t\tmissing count: ").append(rec.getMissing()).append("\n"); + report.append("\t\trest: ").append(OmFileHelper.getHumanSize(restSize)).append("\n"); + if (cleanup) { + rec.cleanup(); + } + } + private void checkAdminDetails() throws Exception { cfg.setUsername(cmdl.getOptionValue("user")); cfg.setEmail(cmdl.getOptionValue("email")); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f7005ffe/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java index 22d8bfd..94da0dd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java @@ -150,11 +150,9 @@ public class RoomSidebar extends Panel { return; } if (cl.hasRight(Right.moderator) || cl.getUid().equals(_c.getUid())) { - { - // basic checks, will throw in case of missing options - obj.getBoolean("mute"); - obj.put("sid", cl.getSid()); - } + // basic checks, will throw in case of missing options + obj.getBoolean("mute"); + obj.put("sid", cl.getSid()); WebSocketHelper.sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.mute, obj.toString())); } }
