Building upon the original Restoring Forced Logouts Removed from MacOS Parental Controls, the original refinements, and the New Year updates to them, I have since added code to add the following features.
- Give two verbal warnings about (approximate) time remaining before forced logout; and
- Make the minutes allowed per day a configurable property which can be customized for individual accounts.
The first was added as a courtesy to our boys. The second was added to allow cutting back or eliminating hours for each boy individually if they didn’t complete their list of basic daily tasks to be done to be allowed the full amount of computer time for the following day, or to increase it for sick days and the like. Making it a property also allows changing it on the fly, without having to alter the code, and also eliminates some very inconvenient hard-coded values.
The properties were added to the end of the application.properties file. At the same time, I added a missing JPA hibernate dialect property that was needed to get the application to work properly with my MariaDB instance.
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQLDialect
# Map properties
users.minutes.[kid-login-1]=60
users.minutes.[kid-login-2]=60Here, [kid-login-1] and [kid-login-2] are the login ID’s for our boys. The default (for us) values of 60 minutes are set for both accounts.
These properties are mapped to a new ConfigProperties.java class in the model package for the application, which looks like the following.
package biz.noip.johnwatne.logtimer.model;
import java.util.Map;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Configuration
@ConfigurationProperties(prefix = "users")
public class ConfigProperties {
private Map<String, Long> minutes;
public Map<String, Long> getMinutes() {
return minutes;
}
public void setMinutes(Map<String, Long> minutes) {
this.minutes = minutes;
}
}We see that the “users” prefix in the “ConfigurationProperties” annotation for the class indicates that those properties in the application.properties file that start with “users.” specify values to use within this configuration class. The configuration class contains a single attribute, “minutes” which maps String values for login IDs to Long values for minutes per day allowed. This ties to the users.minutes.[username]=[minutes] properties in the file. The username part of the property is added as a key to the Map, and the value assigned to the property is set to the corresponding value in the Map.
With the new ConfigProperties class and corresponding properties added, the remaining changes were made to the LogtimerRunner class.
First, the ConfigProperties bean needed to be added as an attribute in LogtimerRunner as follows:
@Autowired
private ConfigProperties configProperties;Then, the logoutIfKidLoggedInTooLong method was modified to
- replace the switch statement with hard-coded cases for each child’s name with an iteration of all properties defined in ConfigProperties.getMinutes(), and
- Add a new call to the standard MacOS “say” command to notify of time left when there are 10 or fewer minutes left until the forced logout.
The updated method is as follows.
/**
* Logs out the specified user if
* <ol>
* <li>they are a named child within the family, and</li>
* <li>the number of minutes they have been logged in exceeds the maximum
* limit.</li>
* </ol>
*
* @param user
* the user whose login time is being checked.
* @param minutes
* the number of minutes the user has been logged in.
* @throws IOException
* if an I/O error occurs.
* @throws InterruptedException
* if an thread is interrupted.
*/
public void logoutIfKidLoggedInTooLong(final String user,
final long minutes) throws IOException, InterruptedException {
if (configProperties != null) {
final Map<String, Long> map = configProperties.getMinutes();
if (map != null) {
Long maxMinutes = map.getOrDefault(user, null);
if (maxMinutes != null) {
LOGGER.debug("maxMinutes for " + user + ": " + maxMinutes
+ "; minutes: " + minutes);
if (minutes > Math.max(maxMinutes - 1, 0)) {
LOGGER.info("Logging out user " + user);
ProcessBuilder processBuilder = new ProcessBuilder(
"/bin/sh", "-c", "./logout-user.sh " + user);
processBuilder.directory(new File("/Users/John"));
Process process = processBuilder.start();
try (final BufferedReader reader =
new BufferedReader(new InputStreamReader(
process.getInputStream()))) {
String line;
while ((line = reader.readLine()) != null) {
LOGGER.info(line);
}
LOGGER.debug(Integer.toString(process.waitFor()));
}
} else if (minutes > Math.max(maxMinutes - 11, 0)) {
final long minutesToGo = maxMinutes - minutes;
final String notification = "Logging out user " + user
+ " in about " + minutesToGo + " minutes";
LOGGER.info(notification);
ProcessBuilder processBuilder = new ProcessBuilder(
"/bin/sh", "-c", "say '" + notification + "'");
Process process = processBuilder.start();
LOGGER.debug(Integer.toString(process.waitFor()));
}
} else {
LOGGER.debug("Time limits not enforced for user " + user);
}
}
} else {
LOGGER.error("ERROR!! UNABLE TO READ CONFIGURATION PROPERTIES");
}
}
I also fixed an off-by-one error in checking the count of login processes for each user in the following method. The value of getCountOfLoginProcessesForUser(persistedLogin.getUsername()) is now checked if < 1, rather than < 2.
/**
* Sets the logout time for users no longer logged in, if not already set,
* to the specified logout time.
*
* @throws IOException
* if an I/O error occurs.
*/
private void setLogoutTimesForUsersNotLoggedIn() throws IOException {
// Do final pass, setting logout times for users no longer logged in.
for (Logins persistedLogin : loginsRepository.findAll()) {
if ((persistedLogin.getLogout() == null)
&& (getCountOfLoginProcessesForUser(
persistedLogin.getUsername()) < 1)) {
// User logged out but not yet indicated as such, so set logout
// time to now.
LOGGER.info("*** " + persistedLogin.getUsername()
+ " logged out; setting logout to now");
persistedLogin.setLogout(LocalDateTime.now());
loginsRepository.save(persistedLogin);
LOGGER.info("*** Record updated: " + persistedLogin);
}
}
}
Finally, to reduce the amount of logging by eliminating info-level logging I had used during initial development, I changed the calculation of lines read from the BufferedReader for the results of the call to get the count of login processes for user in the method getCountOfLoginProcessesForUser(final String user). I removed the logging of each line of output by simplifying
lines = reader.lines().peek(e -> LOGGER.info(e)).count();to
lines = reader.lines().count();I hope there might be others who might find these changes to add flexibility to the program helpful. I may consider adding this to GitHub at some point.