ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

more bug fixes

Browse source 
Former-commit-id: a4f546cb05437083e11ada63a9ff1b5b86620ca9
This commit is contained in:
Ziver Koc 2016-01-15 11:07:57 +01:00
parent c667b56ae4
commit 1e97a4705e
5 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/se/hal/deamon/PCDataSynchronizationClient.java
View file

@ -8,7 +8,6 @@ import se.hal.struct.User;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.log.LogUtil; import zutil.log.LogUtil;
import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.io.Serializable; import java.io.Serializable;
@ -41,10 +40,10 @@ public class PCDataSynchronizationClient implements HalDaemon {
List<User> users = User.getExternalUsers(db); List<User> users = User.getExternalUsers(db);
for(User user : users){ for(User user : users){
if(user.getHostname() == null){ if(user.getHostname() == null){
logger.fine("Hostname not defined for user: "+ user.getUserName()); logger.fine("Hostname not defined for user: "+ user.getUsername());
continue; continue;
} }
logger.fine("Synchronizing user: "+ user.getUserName() +" ("+user.getHostname()+":"+user.getPort()+")"); logger.fine("Synchronizing user: "+ user.getUsername() +" ("+user.getHostname()+":"+user.getPort()+")");
try (Socket s = new Socket(user.getHostname(), user.getPort());){ try (Socket s = new Socket(user.getHostname(), user.getPort());){
ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream()); ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
ObjectInputStream in = new ObjectInputStream(s.getInputStream()); ObjectInputStream in = new ObjectInputStream(s.getInputStream());
@ -52,7 +51,7 @@ public class PCDataSynchronizationClient implements HalDaemon {
// Request peer data // Request peer data
out.writeObject(new PeerDataReqDTO()); out.writeObject(new PeerDataReqDTO());
PeerDataRspDTO peerData = (PeerDataRspDTO) in.readObject(); PeerDataRspDTO peerData = (PeerDataRspDTO) in.readObject();
user.setUserName(peerData.username); user.setUsername(peerData.username);
user.setAddress(peerData.address); user.setAddress(peerData.address);
user.save(db); user.save(db);
@ -92,7 +91,7 @@ public class PCDataSynchronizationClient implements HalDaemon {
stmt.setFloat(6, data.confidence); stmt.setFloat(6, data.confidence);
DBConnection.exec(stmt); DBConnection.exec(stmt);
} }
logger.fine("Stored " + dataList.size() + " entries for sensor " + sensor.getId() + " with offset "+ req.offsetSequenceId +" from " + user.getUserName()); logger.fine("Stored " + dataList.size() + " entries for sensor " + sensor.getId() + " with offset "+ req.offsetSequenceId +" from " + user.getUsername());
} }
else else
logger.fine("Skipped sensor " + sensor.getId()); logger.fine("Skipped sensor " + sensor.getId());

2
src/se/hal/deamon/PCDataSynchronizationDaemon.java
View file

@ -75,7 +75,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
logger.fine("Client requesting peer data"); logger.fine("Client requesting peer data");
PeerDataRspDTO rsp = new PeerDataRspDTO(); PeerDataRspDTO rsp = new PeerDataRspDTO();
User localUser = User.getLocalUser(db); User localUser = User.getLocalUser(db);
rsp.username = localUser.getUserName(); rsp.username = localUser.getUsername();
rsp.address = localUser.getAddress(); rsp.address = localUser.getAddress();
rsp.sensors = new ArrayList<>(); rsp.sensors = new ArrayList<>();

6
src/se/hal/page/PCOverviewHttpPage.java
View file

@ -92,9 +92,9 @@ public class PCOverviewHttpPage extends HalHttpPage {
} }
public static class PowerData{ public static class PowerData{
long timestamp; public long timestamp;
String data; public String data;
String username; public String username;
public PowerData(long time, String data, String uname) { public PowerData(long time, String data, String uname) {
this.timestamp = time; this.timestamp = time;
this.data = data; this.data = data;

6
src/se/hal/page/UserConfigHttpPage.java
View file

@ -1,15 +1,11 @@
package se.hal.page; package se.hal.page;
import se.hal.ControllerManager;
import se.hal.HalContext; import se.hal.HalContext;
import se.hal.intf.HalHttpPage; import se.hal.intf.HalHttpPage;
import se.hal.struct.Sensor;
import se.hal.struct.User; import se.hal.struct.User;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import zutil.parser.Templator; import zutil.parser.Templator;
import zutil.ui.Configurator;
import zutil.ui.Configurator.ConfigurationParam;
import java.util.Map; import java.util.Map;
@ -38,7 +34,7 @@ public class UserConfigHttpPage extends HalHttpPage {
switch(request.get("action")) { switch(request.get("action")) {
// Local User // Local User
case "modify_local_user": case "modify_local_user":
localUser.setUserName(request.get("username")); localUser.setUsername(request.get("username"));
localUser.setAddress(request.get("address")); localUser.setAddress(request.get("address"));
localUser.save(db); localUser.save(db);
break; break;

4
src/se/hal/struct/User.java
View file

@ -39,10 +39,10 @@ public class User extends DBBean{
public String getUserName() { public String getUsername() {
return username; return username;
} }
public void setUserName(String name) { public void setUsername(String name) {
this.username = name; this.username = name;
} }
public String getAddress() { public String getAddress() {